SOL-20 Cleaning up code
Merge pull request #339 from edx-solutions/dcikatic/SOL-20-filter-changes

Dcikatic/sol 20 filter changes