Type now sorts alphabetically, inside each type group