Fix for builtQuery