address fixing, import improving, custom field reducing