Change query executor to only take a query as input.