Improved annotation search