Crude merge of the return formats (formerly v5 and v6) so they are now determined by format type, v5 is the old ones, v6 formats are appended with 2 (version 2 of the return format)