Better error handling for filtering
Merge branch 'master' of https://github.com/cmhouston/excl-mobile