Disable search button fix, CORE-609

Removed the global selectors.

Yes, triggerModalSearch was defined in both base and derived classes with very little difference. So I re-factored the code, so that I didn't have to fix it in both the places.  I will create separate PRs  for this kind of cleanup onwards.