Fixing a query and renaming queries