Update language codes to 6-char; add requestor-id