Added AnnotationGroup
Added annotations with better filtering
Fixed annotations