Fix annotation type group display and sorting, issue 370