Emi - bug fixed

save as code for country / state in nominee/trustee