Fix non-ASCII IDs in topic merge #1491