Amended b5 regex for -
Added EMV parameters
Updated [31], [30]