diff --git a/migration/src/common.py b/migration/src/common.py
index 863378f..376af2d 100644
--- a/migration/src/common.py
+++ b/migration/src/common.py
@@ -187,13 +187,18 @@
     "modules/analysis": "module:analysis",
     "modules/benchmark": "module:benchmark",
     "modules/classification": "module:classification",
+    "modules/examples": "module:demo",
     "modules/expressions": "module:expressions",
     "modules/facet": "module:facet",
     "modules/grouping": "module:grouping",
-    "modules/highlithter": "module:highlithter",
+    "modules/highlighter": "module:highlighter",
     "modules/join": "module:join",
     "modules/luke": "module:luke",
+    "modules/misc": "module:misc",
     "modules/monitor": "module:monitor",
+    "modules/other": None,
+    "modules/queries": "module:queries",
+    "modules/query": "mocule:queries",
     "modules/queryparser": "module:queryparser",
     "modules/replicator": "module:replicator",
     "modules/sandbox": "module:sandbox",
@@ -204,9 +209,17 @@
     "modules/spellchecker": "module:suggest",
     "modules/test-framework": "module:test-framework",
     "luke": "module:luke",
+    "replication (java)": "module:replicator",
+    "spatial": "module:spatial",
+    "query parsers": "module:queryparser",
     "general/build": "tool:build",
     "general/javadocs": "type:documentation",
+    "general/tools": "tool:other",
     "general/test": "type:test",
     "general/website": "website",
     "release wizard": "tool:release-wizard",
+    "Build": None,
+    "Schema and Analysis": None,
+    "Tests": None,
+    "contrib - Solr Cell (Tika extraction)": None,
 }
\ No newline at end of file
diff --git a/migration/src/jira2github_import.py b/migration/src/jira2github_import.py
index 46a3c7e..2eeea9b 100644
--- a/migration/src/jira2github_import.py
+++ b/migration/src/jira2github_import.py
@@ -180,7 +180,11 @@
             if c.startswith("core"):
                 labels.append(f"module:{c}")
             elif c in COMPONENT_TO_LABEL_MAP:
-                labels.append(COMPONENT_TO_LABEL_MAP.get(c))
+                l = COMPONENT_TO_LABEL_MAP[c]
+                if l is not None:
+                    labels.append(l)
+            else:
+                logger.error(f"Unknown Component: {c}")
 
         data = {
             "issue": {
@@ -222,7 +226,7 @@
     parser.add_argument('--issues', type=int, required=False, nargs='*', help='Jira issue number list to be downloaded')
     parser.add_argument('--min', type=int, dest='min', required=False, default=1, help='Minimum Jira issue number to be converted')
     parser.add_argument('--max', type=int, dest='max', required=False, help='Maximum Jira issue number to be converted')
-    parser.add_argument('--num_workers', type=int, dest='num_workers', required=False, default=1, help='Number of worker processes')
+    parser.add_argument('--num-workers', type=int, dest='num_workers', required=False, default=1, help='Number of worker processes')
     args = parser.parse_args()
 
     dump_dir = Path(__file__).resolve().parent.parent.joinpath(JIRA_DUMP_DIRNAME)