diff --git a/src/scribe_data/resources/lexeme_form_metadata.json b/src/scribe_data/resources/lexeme_form_metadata.json
index 5e8786c61..8737eddca 100644
--- a/src/scribe_data/resources/lexeme_form_metadata.json
+++ b/src/scribe_data/resources/lexeme_form_metadata.json
@@ -99,6 +99,10 @@
     "25": {
       "label": "Comitative",
       "qid": "Q838581"
+    },
+    "26": {
+      "label": "NonGenitive",
+      "qid": "Q98946930"
     }
   },
   "02_gender": {
diff --git a/src/scribe_data/wikidata/language_data_extraction/danish/nouns/query_nouns.sparql b/src/scribe_data/wikidata/language_data_extraction/danish/nouns/query_nouns.sparql
deleted file mode 100644
index 6e2db09e2..000000000
--- a/src/scribe_data/wikidata/language_data_extraction/danish/nouns/query_nouns.sparql
+++ /dev/null
@@ -1,34 +0,0 @@
-# tool: scribe-data
-# All Danish (Q9035) nouns (Q1084) and the given forms.
-# Enter this query at https://query.wikidata.org/.
-
-SELECT
-  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?singular
-  ?plural
-  ?gender
-
-WHERE {
-  ?lexeme dct:language wd:Q9035 ;
-    wikibase:lexicalCategory wd:Q1084 ;
-    wikibase:lemma ?singular .
-
-  # MARK: Plural
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pluralForm .
-    ?pluralForm ontolex:representation ?plural ;
-      wikibase:grammaticalFeature wd:Q146786 .
-  }
-
-  # MARK: Gender(s)
-
-  OPTIONAL {
-    ?lexeme wdt:P5185 ?nounGender .
-  }
-
-  SERVICE wikibase:label {
-    bd:serviceParam wikibase:language "[AUTO_LANGUAGE]".
-    ?nounGender rdfs:label ?gender .
-  }
-}
diff --git a/src/scribe_data/wikidata/language_data_extraction/danish/nouns/query_nouns_1.sparql b/src/scribe_data/wikidata/language_data_extraction/danish/nouns/query_nouns_1.sparql
new file mode 100644
index 000000000..7eccf9f1c
--- /dev/null
+++ b/src/scribe_data/wikidata/language_data_extraction/danish/nouns/query_nouns_1.sparql
@@ -0,0 +1,64 @@
+# tool: scribe-data
+# All Danish (Q9035) nouns (Q1084) and the given forms.
+# Enter this query at https://query.wikidata.org/.
+
+SELECT
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
+  ?genitiveIndefiniteSingular
+  ?genitiveDefiniteSingular
+  ?genitiveDefinitePlural
+  ?genitiveIndefinitePlural
+  ?nonGenitiveDefinitePlural
+  ?nonGenitiveIndefinitePlural
+  ?nonGenitiveIndefiniteSingular
+
+WHERE {
+  ?lexeme dct:language wd:Q9035 ;
+          wikibase:lexicalCategory wd:Q1084 .
+
+  # MARK: Genitive
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?genitiveIndefiniteSingularForm .
+    ?genitiveIndefiniteSingularForm ontolex:representation ?genitiveIndefiniteSingular ;
+      wikibase:grammaticalFeature wd:Q146233, wd:Q53997857, wd:Q110786 .
+  }
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?genitiveDefiniteSingularForm .
+    ?genitiveDefiniteSingularForm ontolex:representation ?genitiveDefiniteSingular ;
+      wikibase:grammaticalFeature wd:Q146233, wd:Q53997851, wd:Q110786 .
+  }
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?genitiveDefinitePluralForm .
+    ?genitiveDefinitePluralForm ontolex:representation ?genitiveDefinitePlural ;
+      wikibase:grammaticalFeature wd:Q146233, wd:Q53997851, wd:Q146786 .
+  }
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?genitiveIndefinitePluralForm .
+    ?genitiveIndefinitePluralForm ontolex:representation ?genitiveIndefinitePlural ;
+      wikibase:grammaticalFeature wd:Q146233, wd:Q53997857, wd:Q146786 .
+  }
+
+  # MARK: Non-genitive
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?nonGenitiveDefinitePluralForm .
+    ?nonGenitiveDefinitePluralForm ontolex:representation ?nonGenitiveDefinitePlural ;
+      wikibase:grammaticalFeature wd:Q98946930, wd:Q53997851, wd:Q146786 .
+  }
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?nonGenitiveIndefinitePluralForm .
+    ?nonGenitiveIndefinitePluralForm ontolex:representation ?nonGenitiveIndefinitePlural ;
+      wikibase:grammaticalFeature wd:Q98946930, wd:Q53997857, wd:Q146786 .
+  }
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?nonGenitiveIndefiniteSingularForm .
+    ?nonGenitiveIndefiniteSingularForm ontolex:representation ?nonGenitiveIndefiniteSingular ;
+      wikibase:grammaticalFeature wd:Q98946930, wd:Q53997857, wd:Q110786 .
+  }
+}
diff --git a/src/scribe_data/wikidata/language_data_extraction/danish/nouns/query_nouns_2.sparql b/src/scribe_data/wikidata/language_data_extraction/danish/nouns/query_nouns_2.sparql
new file mode 100644
index 000000000..d58030d36
--- /dev/null
+++ b/src/scribe_data/wikidata/language_data_extraction/danish/nouns/query_nouns_2.sparql
@@ -0,0 +1,20 @@
+# tool: scribe-data
+# All Danish (Q9035) nouns (Q1084) and the given forms.
+# Enter this query at https://query.wikidata.org/.
+
+SELECT
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
+  ?nonGenitiveDefiniteSingular
+
+WHERE {
+  ?lexeme dct:language wd:Q9035 ;
+          wikibase:lexicalCategory wd:Q1084 .
+
+  # MARK: Non-genitive
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?nonGenitiveDefiniteSingularForm .
+    ?nonGenitiveDefiniteSingularForm ontolex:representation ?nonGenitiveDefiniteSingular ;
+      wikibase:grammaticalFeature wd:Q98946930, wd:Q53997851, wd:Q110786 .
+  }
+}