Added the searching of annotations