add organisation and country to the address widget