minor tweaks to Query related classes