Fix override of customer address fields to use function