Beef up the query object a bit
endpoints are queries.