Further reductions in number of queries.
... but the view is still hella slow. #37