Fix address fields import from CSV (#1488900)