habres - tidied up messages for nationality and residency