Move query to core
Merge pull request #102 from alphagov/move-query-to-core

[#62889914] Move query to core