diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino
index d34839e..9c6c186 100644
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -258,7 +258,7 @@ unsigned int LowEdgeOIRTSet;
 unsigned int LowEdgeSet;
 unsigned int LWHighEdgeSet;
 unsigned int LWLowEdgeSet;
-unsigned int mappedfreqold[10];
+unsigned int mappedfreqold[20];
 unsigned int memory[EE_PRESETS_CNT];
 unsigned int MWHighEdgeSet;
 unsigned int MWLowEdgeSet;
@@ -3266,7 +3266,7 @@ void ShowAdvancedRDS() {
   }
 
   String rtplusstring;
-  if (radio.rds.hasRDSplus) rtplusstring = "1\) " + String(radio.rds.RTContent1) + " - 2\) " + String(radio.rds.RTContent2) + "         "; else rtplusstring = myLanguage[language][89];
+  if (radio.rds.hasRDSplus) rtplusstring = "1) " + String(radio.rds.RTContent1) + " - 2) " + String(radio.rds.RTContent2) + "         "; else rtplusstring = myLanguage[language][89];
   if (hasrtplusold != radio.rds.hasRDSplus) {
     if (radio.rds.hasRDSplus) tft.setTextColor(SecondaryColor); else tft.setTextColor(GreyoutColor);
     tft.drawString("RT+",  116, 45, GFXFF);
@@ -3865,7 +3865,7 @@ void BuildAFScreen() {
 
     tft.drawRoundRect(35, 32, 138, 20, 5, ActiveColor);
 
-    for (byte i = 0; i < 11; i++) mappedfreqold[i] = 0;
+    for (byte i = 0; i < 20; i++) mappedfreqold[i] = 0;
     RDSstatusold = false;
     ShowFreq(0);
     Stereostatusold = false;
diff --git a/src/TEF6686.cpp b/src/TEF6686.cpp
index ac5941f..6d0addd 100644
--- a/src/TEF6686.cpp
+++ b/src/TEF6686.cpp
@@ -845,7 +845,7 @@ void TEF6686::clearRDS (bool fullsearchrds)
   for (i = 0; i < 65; i++) rt_buffer[i] = 0;
   for (i = 0; i < 33; i++) rt_buffer32[i] = 0;
   for (i = 0; i < 18; i++) rds.stationType[i] = 0;
-  for (i = 0; i < 7; i++) rds.picode[i] = 0;
+  for (i = 0; i < 6; i++) rds.picode[i] = 0;
 
   for (i = 0; i < 50; i++) {
     af[i].frequency = 0;
@@ -862,10 +862,8 @@ void TEF6686::clearRDS (bool fullsearchrds)
     eon[i].mappedfreq2 = 0;
     eon[i].mappedfreq3 = 0;
     eon[i].checked = false;
-    for (int y = 0; y < 9; y++) {
-      eon_buffer[i][y] = 0;
-      eon_buffer2[i][y] = 0;
-      EONPStext[i][y] = L'\0';
+    for (int y = 0; y < 5; y++) {
+      eon[i].picode[y] = '\0';
     }
   }