New FCO mappings - query strings, and first 'munge'