Various tweaks to support more bilingual content

Migration scripts might need to be renumbered.