diff --git a/docs/graphics/options_gameinfo_emulation.png b/docs/graphics/options_gameinfo_emulation.png
index 05f9b3626..73b1b03d5 100644
Binary files a/docs/graphics/options_gameinfo_emulation.png and b/docs/graphics/options_gameinfo_emulation.png differ
diff --git a/docs/index.html b/docs/index.html
index 53a393266..5811f2beb 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3205,6 +3205,11 @@
       <td>Define a temporary ID for the PlusROM backends (32 chars, hex)</td>
     </tr>
 
+    <tr>
+      <td><pre>-filterbstypes &lt;1|0&gt;</pre></td>
+      <td>Enable filtering of bankswitch type list in <a href="#EmulationProps"><b>Emulation Properties</b></a> by ROM size.</td>
+    </tr>
+
     <tr>
       <td><pre>-help</pre></td>
       <td>Print a help message describing these options, and then
@@ -4818,12 +4823,13 @@ Ms Pac-Man (Stella extended codes):
 
   <tr>
     <td VALIGN="TOP"><a name="PropertiesCartType"><i>Cart.Type</i></a></td>
-    <td>Indicates the bank-switching type for the game.
+    <td>Indicates the bankswitching type for the game.
       The value of this property must be either <b>Auto</b> or one of the following
-      (for more information about bank-switching see Kevin Horton's <a href="http://kevtris.org/files/sizes.txt">2600 bankswitching
+      (for more information about bankswitching see Kevin Horton's <a href="http://kevtris.org/files/sizes.txt">2600 bankswitching
       document</a> or the documentation in each cartridge's source code file) types. Types marked
       as (&#185;) do currently have no reliable auto-detection, those marked as (&#178;)
-      are not fully supported in the debugger.
+      are not fully supported in the debugger.<br/>
+      Note: If 'Filter' is checked, only the bankswitching types matching the ROM size are listed.
       <table cellpadding="2" border="1">
         <tr><th>&nbsp;Type&nbsp;</th><th>Description</th><th>File Extension<br>(to force type)</th></tr>
         <tr><td>0840 </td><td>8K EconoBanking</td><td>.084, .0840</td></tr>
diff --git a/src/emucore/Bankswitch.hxx b/src/emucore/Bankswitch.hxx
index 28beda687..1fa7c4ca9 100644
--- a/src/emucore/Bankswitch.hxx
+++ b/src/emucore/Bankswitch.hxx
@@ -43,7 +43,7 @@ class Bankswitch
       _4K,    _4KSC,   _AR,   _BF,   _BFSC, _BUS,  _CDF,   _CM,
       _CTY,   _CV,     _DF,   _DFSC, _DPC,  _DPCP, _E0,    _E7,
       _EF,    _EFSC,   _F0,   _F4,   _F4SC, _F6,   _F6SC,  _F8,
-      _F8SC,  _FA,     _FA2,  _FC,   _FE,   _MDM,  _MVC,  _SB,
+      _F8SC,  _FA,     _FA2,  _FC,   _FE,   _MDM,  _MVC,   _SB,
       _TVBOY, _UA,     _UASW, _WD,   _WDSW, _X07,
     #ifdef CUSTOM_ARM
       _CUSTOM,
diff --git a/src/emucore/CartDetector.cxx b/src/emucore/CartDetector.cxx
index a88f704ed..7d11ef634 100644
--- a/src/emucore/CartDetector.cxx
+++ b/src/emucore/CartDetector.cxx
@@ -499,8 +499,8 @@ bool CartDetector::isProbablyCV(const ByteBuffer& image, size_t size)
   // CV RAM access occurs at addresses $f3ff and $f400
   // These signatures are attributed to the MESS project
   static constexpr uInt8 signature[2][3] = {
-    { 0x9D, 0xFF, 0xF3 },  // STA $F3FF.X
-    { 0x99, 0x00, 0xF4 }   // STA $F400.Y
+    { 0x9D, 0xFF, 0xF3 },  // STA $F3FF,X
+    { 0x99, 0x00, 0xF4 }   // STA $F400,Y
   };
   if(searchForBytes(image, size, signature[0], 3))
     return true;