added better data handling for customer addres