cleared out server side filtering and a few misc cleanups
more caching