Discorick/enhance filter controls



<!---
@huboard:{"order":171.5,"milestone_order":456,"custom_state":""}
-->