Update for counterpart formats in Firefox & Co