Disable search button fix, CORE-609
Removed global selectors CORE-609
Merge pull request #2030 from reciprocity/feature/CORE-609-disabled-search-btnfix

Disable search button fix, CORE-609