Final updates for Search bar!