diff --git a/src/scribe_data/language_data_extraction/Estonian/prepositions/query_prepositions.sparql b/src/scribe_data/language_data_extraction/Estonian/prepositions/query_prepositions.sparql
index 7ad9c8b43..f8f1cb2b4 100644
--- a/src/scribe_data/language_data_extraction/Estonian/prepositions/query_prepositions.sparql
+++ b/src/scribe_data/language_data_extraction/Estonian/prepositions/query_prepositions.sparql
@@ -5,21 +5,9 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?preposition
-  ?case
 
 WHERE {
   ?lexeme dct:language wd:Q9072 ;
     wikibase:lexicalCategory wd:Q4833830 ;
     wikibase:lemma ?preposition .
-
-  # MARK: Corresponding Case
-
-  OPTIONAL {
-    ?lexeme wdt:P5713 ?caseForm .
-  }
-
-  SERVICE wikibase:label {
-    bd:serviceParam wikibase:language "[AUTO_LANGUAGE]".
-    ?caseForm rdfs:label ?case .
-  }
 }
diff --git a/src/scribe_data/language_data_extraction/Latin/adverbs/query_adverbs.sparql b/src/scribe_data/language_data_extraction/Latin/adverbs/query_adverbs.sparql
new file mode 100644
index 000000000..04904622d
--- /dev/null
+++ b/src/scribe_data/language_data_extraction/Latin/adverbs/query_adverbs.sparql
@@ -0,0 +1,31 @@
+# tool: scribe-data
+# All Latin language (Q397) adverbs (Q380057) and the given forms.
+# Enter this query at https://query.wikidata.org/.
+
+SELECT
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
+  ?adverb
+  ?comparative
+  ?superlative
+
+WHERE {
+  ?lexeme dct:language wd:Q397 ;
+    wikibase:lexicalCategory wd:Q380057 ;
+    wikibase:lemma ?adverb .
+
+  # MARK: Comparative
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?comparativeForm .
+    ?comparativeForm ontolex:representation ?comparative ;
+      wikibase:grammaticalFeature wd:Q14169499 .
+  }
+
+  # MARK: Superlative
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?superlativeForm .
+    ?superlativeForm ontolex:representation ?superlative ;
+      wikibase:grammaticalFeature wd:Q1817208 .
+  }
+}
diff --git a/src/scribe_data/language_data_extraction/Latin/prepositions/query_prepositions.sparql b/src/scribe_data/language_data_extraction/Latin/prepositions/query_prepositions.sparql
new file mode 100644
index 000000000..43a114a8e
--- /dev/null
+++ b/src/scribe_data/language_data_extraction/Latin/prepositions/query_prepositions.sparql
@@ -0,0 +1,32 @@
+# tool: scribe-data
+# All Latin language (Q397) postpositions (Q4833830) and the given forms.
+# Enter this query at https://query.wikidata.org/.
+
+SELECT
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
+  ?preposition
+  ?accusative
+  ?ablative
+
+WHERE {
+  ?lexeme dct:language wd:Q397 ;
+    wikibase:lexicalCategory wd:Q4833830 ;
+    wikibase:lemma ?preposition .
+
+
+  # MARK: Accusative
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?accusativeForm .
+    ?accusativeForm ontolex:representation ?accusative ;
+      wikibase:grammaticalFeature wd:Q146078 .
+  }
+
+  # MARK: Ablative
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?ablativeForm .
+    ?ablativeForm ontolex:representation ?ablative ;
+      wikibase:grammaticalFeature wd:Q156986 .
+  }
+}
diff --git a/src/scribe_data/language_data_extraction/Slovak/prepositions/query_prepositions.sparql b/src/scribe_data/language_data_extraction/Slovak/prepositions/query_prepositions.sparql
index 0180569f1..c485bd0ed 100644
--- a/src/scribe_data/language_data_extraction/Slovak/prepositions/query_prepositions.sparql
+++ b/src/scribe_data/language_data_extraction/Slovak/prepositions/query_prepositions.sparql
@@ -4,22 +4,10 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?preposition ?case
+  ?preposition
 
 WHERE {
   ?lexeme dct:language wd:Q9058 ;
     wikibase:lexicalCategory wd:Q4833830 ;
-    wikibase:lemma ?lemma .
-
-  # MARK: Corresponding Case
-
-  OPTIONAL {
-    ?lexeme wdt:P5713 ?caseForm .
-  }
-
-  SERVICE wikibase:label {
-    bd:serviceParam wikibase:language "[AUTO_LANGUAGE]".
-    ?lemma rdfs:label ?preposition .
-    ?caseForm rdfs:label ?case .
-  }
+    wikibase:lemma ?preposition .
 }