[JIRA] (HHH-16514) Column sorting leads to incorrect mappings