Returns filters if they have a result.
Fixes filters and cleans controllers.
Merges with upstream.
Merge pull request #450 from LearningLocker/issue/filters

Fixes filters.