Refactor also query suggestions into query service. See #39.