Store query in request.context

... instead of passing it around amongst controllers