[OE-3941] remove short tags and fix collation