Fixed query builder bug
Fixed merge conflict