Search was being performed no matter what button user selects (cancel or search). Fixed this to only search on search
Merge branch 'master' into dlee