Improve Util#matchEntityType to check for an exact match first