Merge pull request #1 from petehuang/hiro

Hiro
Finalized search show