Improvements to Advanced Attribute Mapping Settings