added ConstructQuery