fix filter & make work type required
Merge branch 'master' of https://github.com/alekhurst/CatalystCards