simplify and remove "cancel" bug. Detect search button click
Merge pull request #1 from tyhoff/master

simplify and remove "cancel" bug. Detect search button click