refactoring renaming QueryOperation