Use Capname instead of TCap Codes and enable explicitly alternate chars.
Merge.