Thanks for the great suggestions! I hadn't considered using Query Tags in this way. Combining tags with folders and naming conventions seems like a practical approach for keeping the queries organized as they grow. Really appreciate the helpful advice!