Filtering work
Merge branch 'master' of https://github.com/cmhouston/excl-mobile
More filter work
Merge branch 'master' of https://github.com/cmhouston/excl-mobile