Fix search
Merge branch 'master' into feature/refactor-search-css
Merge pull request #12 from ericmasiello/feature/refactor-search-css

Merge branch 'master' into feature/refactor-search-css