Post-merge Search bar fix