Fixing up query generation