Search bar fixes