New mappings for FCO, with query strings