Simplify xml mappings

 * For bing remove Germany "fix" as it negatively affects most situations
   Instead can override at a higher (e.g. app level)
   or provide specific case to use AdminDistrict2 and only do in those cases