added code which replaces address fields values