Move queries out of views.
Less blocky.