Allow dashes in entity subtypes, pretty print