Make search bar slightly more robust