Additional filter changes based on feedback

https://www.pivotaltracker.com/story/show/40495565