Fixed:
Uppercase all record types
Some false matches due to optionality of space preceeding record type