Improve the query a bit by limiting the response to just contain the fields we want