Improve support for 5 char grantee codes