More changes to queries to allow for filters and new views
Major changes to filters and views