search box, other fixes for search