Update key mapping so Issuer Type is not ignored