Fix Query constructors