Split filter and search of annotations into two features