improve navigation and search handling