diff --git a/imports/api/ActiveFires/server/countFires.js b/imports/api/ActiveFires/server/countFires.js
index 0858e95..dbb91e6 100644
--- a/imports/api/ActiveFires/server/countFires.js
+++ b/imports/api/ActiveFires/server/countFires.js
@@ -9,7 +9,7 @@ const debug = 0;
 const cleanProv = (prov, stringsToRemove) => {
   let lprov = prov;
   stringsToRemove.forEach((st) => {
-    lprov = lprov.replace(st, '');
+    lprov = lprov.replace(st[0], st[1]);
   });
   return lprov;
 };
diff --git a/imports/api/ActiveFires/server/tweetFiresInZone.js b/imports/api/ActiveFires/server/tweetFiresInZone.js
index 497f5e1..797dab6 100644
--- a/imports/api/ActiveFires/server/tweetFiresInZone.js
+++ b/imports/api/ActiveFires/server/tweetFiresInZone.js
@@ -9,17 +9,22 @@ const autonomies = tbuffer(JSON.parse(getPrivateFile('data/es-atlas-autonomies.j
 const portugal = tbuffer(JSON.parse(getPrivateFile('data/pt-atlas.json')), 0);
 
 const stringsToRemove = [
-  'Ciudad Autónoma de',
-  'País Vasco/',
-  'Comunidad Foral de',
-  'Región de',
-  // FIXME Madrid y Valencia
-  'Comunidad de',
-  'Cataluña/',
-  // FIXME Castilla-León
-  'Castilla-',
-  'Principado de',
-  ' '
+  ['Ciudad Autónoma de', ''],
+  ['País Vasco/', ''],
+  ['Pais Vasco', 'Euskadi'],
+  ['Comunidad Foral de', ''],
+  ['Región de', ''],
+  ['Valencia', 'CValenciana'],
+  ['Comunidad de Madrid', 'CMadrid'],
+  ['La Mancha', 'CLMancha'],
+  ['León', 'CyL'],
+  ['Castilla-', ''],
+  ['Cataluña/', ''],
+  ['Cataluña', 'Catalunya'],
+  ['Baleares', 'IllesBalears'],
+  ['Galicia', 'Galiza'],
+  ['Principado de', ''],
+  [' ', '']
 ];
 
 const composeTweet = (num, stats) => {