Cleaned up filters and models for lists/tables, will move to separate project soon.