Wrap search terms in quotes, refactor applied filters helper
Merge branch 'master' into demo