refactoring of services responsible for handling queries