Reduce as minimum issue controller complexity.
Introduce query objects.