Refactored code to use multiple views for filters, still not working.