diff --git a/Assets/mappings.jsonc b/Assets/mappings.jsonc
index 042d80e..0baa34b 100644
--- a/Assets/mappings.jsonc
+++ b/Assets/mappings.jsonc
@@ -11581,6 +11581,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -11964,6 +11970,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -12212,6 +12224,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -13191,7 +13209,7 @@
     "UseForceRename": false,
     "SearchParams": {
       "GenericParams": {
-        "IsPublic": true,
+        "IsPublic": false,
         "IsAbstract": false,
         "IsInterface": false,
         "IsStruct": false,
@@ -13221,6 +13239,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -13326,6 +13350,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -15340,6 +15370,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -15389,6 +15425,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -15439,6 +15481,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -15490,6 +15538,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -15538,6 +15592,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -16296,7 +16356,7 @@
     "UseForceRename": false,
     "SearchParams": {
       "GenericParams": {
-        "IsPublic": true,
+        "IsPublic": false,
         "IsStruct": true
       },
       "Methods": {
@@ -16325,6 +16385,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [
@@ -16345,7 +16411,7 @@
     "UseForceRename": false,
     "SearchParams": {
       "GenericParams": {
-        "IsPublic": true,
+        "IsPublic": false,
         "IsStruct": true
       },
       "Methods": {
@@ -16372,6 +16438,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -16928,6 +17000,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -17024,6 +17102,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -17071,6 +17155,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -17119,6 +17209,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
@@ -17345,6 +17441,12 @@
       },
       "NestedTypes": {
         "IsNested": true,
+        "IsNestedAssembly": false,
+        "IsNestedFamily": false,
+        "IsNestedPrivate": false,
+        "IsNestedPublic": true,
+        "IsNestedFamilyAndAssembly": false,
+        "IsNestedFamilyOrAssembly": false,
         "NestedTypeParentName": "",
         "NestedTypeCount": -1,
         "IncludeNestedTypes": [],
diff --git a/RecodeItLib/Remapper/ReMapper.cs b/RecodeItLib/Remapper/ReMapper.cs
index 89682b0..91dd0d1 100644
--- a/RecodeItLib/Remapper/ReMapper.cs
+++ b/RecodeItLib/Remapper/ReMapper.cs
@@ -173,9 +173,14 @@ public class ReMapper
         }
 
         // Filter down nested objects
-        types = !mapping.SearchParams.NestedTypes.IsNested 
-            ? types.Where(type => tokens!.Any(token => type.Name.StartsWith(token))) 
-            : types.Where(t => t.DeclaringType != null && t.DeclaringType.Name == mapping.SearchParams.NestedTypes.NestedTypeParentName);
+        types = !mapping.SearchParams.NestedTypes.IsNested
+            ? types.Where(type => tokens!.Any(token => type.Name.StartsWith(token)))
+            : types.Where(t => t.DeclaringType != null);
+
+        if (mapping.SearchParams.NestedTypes.NestedTypeParentName != string.Empty)
+        {
+            types = types.Where(t => t.DeclaringType.Name == mapping.SearchParams.NestedTypes.NestedTypeParentName);
+        }
         
         // Run through a series of filters and report an error if all types are filtered out.
         var filters = new TypeFilters();