diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c
index e14a6d49e..b6e12cd8d 100644
--- a/rigs/yaesu/ft991.c
+++ b/rigs/yaesu/ft991.c
@@ -228,41 +228,63 @@ const struct rig_caps ft991_caps =
 
     /* mode/filter list, .remember =  order matters! */
     .filters =            {
-        {FT991_CW_RTTY_PKT_RX_MODES,  Hz(1700)},    /* Normal CW, RTTY, PKT */
-        {FT991_CW_RTTY_PKT_RX_MODES,  Hz(500)},     /* Narrow CW, RTTY, PKT */
-        {FT991_CW_RTTY_PKT_RX_MODES,  Hz(2400)},    /* Wide   CW, RTTY, PKT */
-        {FT991_CW_RTTY_PKT_RX_MODES,  Hz(2000)},    /*        CW, RTTY, PKT */
-        {FT991_CW_RTTY_PKT_RX_MODES,  Hz(1400)},    /*        CW, RTTY, PKT */
-        {FT991_CW_RTTY_PKT_RX_MODES,  Hz(1200)},    /*        CW, RTTY, PKT */
-        {FT991_CW_RTTY_PKT_RX_MODES,  Hz(800)},     /*        CW, RTTY, PKT */
-        {FT991_CW_RTTY_PKT_RX_MODES,  Hz(400)},     /*        CW, RTTY, PKT */
-        {FT991_CW_RTTY_PKT_RX_MODES,  Hz(300)},     /*        CW, RTTY, PKT */
-        {FT991_CW_RTTY_PKT_RX_MODES,  Hz(200)},     /*        CW, RTTY, PKT */
-        {FT991_CW_RTTY_PKT_RX_MODES,  Hz(100)},     /*        CW, RTTY, PKT */
+        {FT991_RTTY_DATA_RX_MODES,    Hz(500)},     /* Normal RTTY, DATA */
+        {FT991_RTTY_DATA_RX_MODES,    Hz(300)},     /* Narrow RTTY, DATA */
+        {FT991_RTTY_DATA_RX_MODES,    Hz(3000)},    /* Wide   RTTY, DATA */
+        {FT991_RTTY_DATA_RX_MODES,    Hz(2400)},    /*        RTTY, DATA */
+        {FT991_RTTY_DATA_RX_MODES,    Hz(2000)},    /*        RTTY, DATA */
+        {FT991_RTTY_DATA_RX_MODES,    Hz(1700)},    /*        RTTY, DATA */
+		{FT991_RTTY_DATA_RX_MODES,    Hz(1400)},    /*        RTTY, DATA */
+		{FT991_RTTY_DATA_RX_MODES,    Hz(1200)},    /*        RTTY, DATA */
+        {FT991_RTTY_DATA_RX_MODES,    Hz(800)},     /*        RTTY, DATA */
+        {FT991_RTTY_DATA_RX_MODES,    Hz(450)},     /*        RTTY, DATA */
+        {FT991_RTTY_DATA_RX_MODES,    Hz(400)},     /*        RTTY, DATA */
+        {FT991_RTTY_DATA_RX_MODES,    Hz(350)},     /*        RTTY, DATA */
+		{FT991_RTTY_DATA_RX_MODES,    Hz(250)},     /*        RTTY, DATA */
+		{FT991_RTTY_DATA_RX_MODES,    Hz(200)},     /*        RTTY, DATA */
+		{FT991_RTTY_DATA_RX_MODES,    Hz(150)},     /*        RTTY, DATA */
+		{FT991_RTTY_DATA_RX_MODES,    Hz(100)},     /*        RTTY, DATA */
+		{FT991_RTTY_DATA_RX_MODES,    Hz(50)},      /*        RTTY, DATA */
+		{FT991_CW_RX_MODES,           Hz(2400)},    /* Normal CW */
+        {FT991_CW_RX_MODES,           Hz(500)},     /* Narrow CW */
+        {FT991_CW_RX_MODES,           Hz(3000)},    /* Wide   CW */
+        {FT991_CW_RX_MODES,           Hz(2000)},    /*        CW */
+		{FT991_CW_RX_MODES,           Hz(1700)},    /*        CW */
+		{FT991_CW_RX_MODES,           Hz(1400)},    /*        CW */
+		{FT991_CW_RX_MODES,           Hz(1200)},    /*        CW */
+		{FT991_CW_RX_MODES,           Hz(800)},     /*        CW */
+		{FT991_CW_RX_MODES,           Hz(450)},     /*        CW */
+		{FT991_CW_RX_MODES,           Hz(400)},     /*        CW */
+		{FT991_CW_RX_MODES,           Hz(350)},     /*        CW */
+		{FT991_CW_RX_MODES,           Hz(300)},     /*        CW */
+		{FT991_CW_RX_MODES,           Hz(250)},     /*        CW */
+		{FT991_CW_RX_MODES,           Hz(200)},     /*        CW */
+		{FT991_CW_RX_MODES,           Hz(150)},     /*        CW */
+		{FT991_CW_RX_MODES,           Hz(100)},     /*        CW */
+		{FT991_CW_RX_MODES,           Hz(50)},      /*        CW */
         {RIG_MODE_SSB,                Hz(2400)},    /* Normal SSB */
-        {RIG_MODE_SSB,                Hz(1800)},    /* Narrow SSB */
+        {RIG_MODE_SSB,                Hz(1500)},    /* Narrow SSB */
         {RIG_MODE_SSB,                Hz(3200)},    /* Wide   SSB */
-        {RIG_MODE_SSB,                Hz(3000)},    /* Wide   SSB */
+        {RIG_MODE_SSB,                Hz(3000)},    /*        SSB */
         {RIG_MODE_SSB,                Hz(2900)},    /*        SSB */
         {RIG_MODE_SSB,                Hz(2800)},    /*        SSB */
         {RIG_MODE_SSB,                Hz(2700)},    /*        SSB */
         {RIG_MODE_SSB,                Hz(2600)},    /*        SSB */
         {RIG_MODE_SSB,                Hz(2500)},    /*        SSB */
-        {RIG_MODE_SSB,                Hz(2250)},    /*        SSB */
+        {RIG_MODE_SSB,                Hz(2300)},    /*        SSB */
+		{RIG_MODE_SSB,                Hz(2200)},    /*        SSB */
         {RIG_MODE_SSB,                Hz(2100)},    /*        SSB */
         {RIG_MODE_SSB,                Hz(1950)},    /*        SSB */
         {RIG_MODE_SSB,                Hz(1650)},    /*        SSB */
-        {RIG_MODE_SSB,                Hz(1500)},    /*        SSB */
         {RIG_MODE_SSB,                Hz(1350)},    /*        SSB */
         {RIG_MODE_SSB,                Hz(1100)},    /*        SSB */
         {RIG_MODE_SSB,                Hz(850)},     /*        SSB */
         {RIG_MODE_SSB,                Hz(600)},     /*        SSB */
         {RIG_MODE_SSB,                Hz(400)},     /*        SSB */
         {RIG_MODE_SSB,                Hz(200)},     /*        SSB */
-        {FT991_CW_RTTY_PKT_RX_MODES | RIG_MODE_SSB, RIG_FLT_ANY },
         {RIG_MODE_AM,                 Hz(9000)},    /* Normal AM */
         {RIG_MODE_AMN,                Hz(6000)},    /* Narrow AM */
-        {FT991_FM_WIDE_RX_MODES,      Hz(16000)},   /* Normal FM */
+        {FT991_FM_WIDE_RX_MODES,      Hz(16000)},   /* Normal FM, PKTFM, C4FM */
         {RIG_MODE_FMN,                Hz(9000)},    /* Narrow FM */
 
         RIG_FLT_END,
diff --git a/rigs/yaesu/ft991.h b/rigs/yaesu/ft991.h
index 78b3c14a2..ec126988b 100644
--- a/rigs/yaesu/ft991.h
+++ b/rigs/yaesu/ft991.h
@@ -41,8 +41,7 @@
 #define FT991_FM_WIDE_RX_MODES (RIG_MODE_FM|RIG_MODE_PKTFM|RIG_MODE_C4FM)
 #define FT991_FM_RX_MODES (FT991_FM_WIDE_RX_MODES|RIG_MODE_FMN)
 #define FT991_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR)
-#define FT991_CW_RTTY_PKT_RX_MODES (RIG_MODE_RTTY|RIG_MODE_RTTYR|\
-        RIG_MODE_PKTUSB|RIG_MODE_PKTLSB|RIG_MODE_CW|RIG_MODE_CWR)
+#define FT991_RTTY_DATA_RX_MODES (RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTUSB|RIG_MODE_PKTLSB)
 
 /* TRX caps */
 
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 9c4c59d3c..093b0e38e 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -7928,7 +7928,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
             else if (width <= 150) { w = 3; }
             else if (width <= 200) { w = 4; }
             else if (width <= 250) { w = 5; }
-            else if (width <= 305) { w = 6; }
+            else if (width <= 300) { w = 6; }
             else if (width <= 350) { w = 7; }
             else if (width <= 400) { w = 8; }
             else if (width <= 450) { w = 9; }