Improve searching from navigation bar.