Refactored.
Deleted QueryHandler.