[2.3] - Search bar fixes

Please see #11395 & #11390