add country and street, fix missing zip