1. In a computer system, a method comprising: searching for, in a first search, at least one match to a search query in a text portion of an annotated document; searching for, in a second search, at least one match to the search query in an annotated portion of the annotated document; and returning a search result based on the result of at least one of the first and second searches.