This now requires the type have at least two letters. The `\\.?\\w+` should probably be `(?:\\.\\w+)?` instead.