Separate queries from reporting