Adding country codes to query results.
Improving formatting of list of formats: more brief, dropping empty members (e.g.: " + CD")