make fix more robust
Merge remote-tracking branch 'origin/bgx-fix-for-search-input-on-community'