Move central query into its own container