one step closer to pre-user queries views, lots of cleanups