Changes to support 2 letter prefix/suffix codes (e.g. AX, WX, ...)