[BUGFIX] Use schema helper
Keep query response in registry

By keeping the query in the registry it can later easily be re-used by other components.