re-fixed basic search
Merge branch 'master' of https://github.com/jjcody/showroom