refactored Search into Annotations and Navigation