Enable Mapped Field Types to Override Default Highlighter

Enable Mapped Field Types to Override Default Highlighter #4628