Fixing comment
Moving logic to Query objects