fixed querybuilder issues