Fixing a bug and updating the project based queries to be more user friendly