Updates to filter view options per Tuba and Erin's emails
Merge branch 'develop' into feat/MOB-91#notifications