From bdf0bc2d44fa4537e8d9816ddfc90ebe2f91b9d6 Mon Sep 17 00:00:00 2001
From: Andrew Tavis McAllister <andrew.t.mcallister@gmail.com>
Date: Wed, 20 Mar 2024 23:33:42 +0100
Subject: [PATCH] #101 sparql query formatting and adding Greek verbs

---
 .../languages/Arabic/nouns/query_nouns.sparql       |  5 +++--
 .../languages/Arabic/verbs/query_verbs.sparql       |  5 +++--
 .../languages/Basque/nouns/query_nouns.sparql       |  5 +++--
 .../languages/Basque/verbs/query_verbs.sparql       |  5 +++--
 .../languages/Bengali/nouns/query_nouns.sparql      |  5 +++--
 .../languages/Bengali/verbs/query_verbs.sparql      |  6 ++++--
 .../Bokm\303\245l/nouns/query_nouns.sparql"         |  7 +++++--
 .../Bokm\303\245l/verbs/query_verbs.sparql"         |  5 +++--
 .../languages/Czech/nouns/query_nouns.sparql        |  7 +++++--
 .../Czech/prepositions/query_prepositions.sparql    |  6 ++++--
 .../languages/Czech/verbs/query_verbs.sparql        |  6 ++++--
 .../languages/Danish/nouns/query_nouns.sparql       |  7 +++++--
 .../languages/Danish/verbs/query_verbs.sparql       |  6 ++++--
 .../languages/English/nouns/query_nouns.sparql      |  6 ++++--
 .../languages/English/verbs/query_verbs.sparql      | 10 ++++++++--
 .../languages/Esperanto/nouns/query_nouns.sparql    |  8 +++++---
 .../languages/Esperanto/verbs/query_verbs.sparql    |  6 ++++--
 .../languages/Estonian/nouns/query_nouns.sparql     |  6 ++++--
 .../Estonian/prepositions/query_prepositions.sparql |  6 ++++--
 .../languages/Estonian/verbs/query_verbs.sparql     |  6 ++++--
 .../languages/Finnish/nouns/query_nouns.sparql      |  6 ++++--
 .../languages/Finnish/verbs/query_verbs.sparql      |  6 ++++--
 .../languages/French/nouns/query_nouns.sparql       |  7 +++++--
 .../languages/French/verbs/query_verbs_1.sparql     |  3 ++-
 .../languages/French/verbs/query_verbs_2.sparql     |  3 ++-
 .../languages/German/nouns/query_nouns.sparql       |  7 +++++--
 .../German/prepositions/query_prepositions.sparql   |  6 ++++--
 .../languages/German/verbs/query_verbs_1.sparql     |  3 ++-
 .../languages/German/verbs/query_verbs_2.sparql     |  3 ++-
 .../languages/Greek/nouns/query_nouns.sparql        |  7 +++++--
 .../languages/Greek/verbs/query_verbs.sparql        | 13 +++++++++++++
 .../languages/Hausa/nouns/query_nouns.sparql        |  6 ++++--
 .../languages/Hausa/verbs/query_verbs.sparql        |  6 ++++--
 .../languages/Hebrew/nouns/query_nouns.sparql       |  6 ++++--
 .../languages/Hebrew/verbs/query_verbs.sparql       |  6 ++++--
 .../languages/Hindi/nouns/query_nouns.sparql        |  6 ++++--
 .../languages/Hindi/verbs/query_verbs.sparql        |  6 ++++--
 .../languages/Indonesian/nouns/query_nouns.sparql   |  5 +++--
 .../languages/Indonesian/verbs/query_verbs.sparql   |  6 ++++--
 .../languages/Italian/nouns/query_nouns.sparql      |  7 +++++--
 .../languages/Italian/verbs/query_verbs_1.sparql    |  3 ++-
 .../languages/Italian/verbs/query_verbs_2.sparql    |  3 ++-
 .../languages/Japanese/nouns/query_nouns.sparql     |  5 +++--
 .../languages/Japanese/verbs/query_verbs.sparql     |  6 ++++--
 .../languages/Kurmanji/nouns/query_nouns.sparql     |  6 ++++--
 .../languages/Kurmanji/verbs/query_verbs.sparql     |  6 ++++--
 .../languages/Latin/nouns/query_nouns.sparql        |  6 ++++--
 .../languages/Latin/verbs/query_verbs.sparql        |  6 ++++--
 .../languages/Malay/nouns/query_nouns.sparql        |  5 +++--
 .../languages/Malay/verbs/query_verbs.sparql        |  6 ++++--
 .../languages/Malayalam/nouns/query_nouns.sparql    |  5 +++--
 .../languages/Malayalam/verbs/query_verbs.sparql    |  6 ++++--
 .../languages/Mandarin/nouns/query_nouns.sparql     |  5 +++--
 .../languages/Mandarin/verbs/query_verbs.sparql     |  6 ++++--
 .../languages/Nynorsk/nouns/query_nouns.sparql      |  7 +++++--
 .../languages/Nynorsk/verbs/query_verbs.sparql      |  6 ++++--
 .../languages/Polish/nouns/query_nouns.sparql       |  7 +++++--
 .../languages/Polish/verbs/query_verbs.sparql       |  6 ++++--
 .../languages/Portuguese/nouns/query_nouns.sparql   |  7 +++++--
 .../languages/Portuguese/verbs/query_verbs.sparql   |  3 ++-
 .../languages/Russian/nouns/query_nouns.sparql      |  7 +++++--
 .../Russian/prepositions/query_prepositions.sparql  |  6 ++++--
 .../languages/Russian/verbs/query_verbs.sparql      |  3 ++-
 .../languages/Slovak/nouns/query_nouns.sparql       |  5 +++--
 .../Slovak/prepositions/query_prepositions.sparql   |  5 +++--
 .../languages/Slovak/verbs/query_verbs.sparql       |  6 ++++--
 .../languages/Spanish/nouns/query_nouns.sparql      |  7 +++++--
 .../languages/Spanish/verbs/query_verbs_1.sparql    |  4 +++-
 .../languages/Spanish/verbs/query_verbs_2.sparql    |  3 ++-
 .../languages/Spanish/verbs/query_verbs_3.sparql    |  3 ++-
 .../languages/Swedish/nouns/query_nouns.sparql      |  3 ++-
 .../languages/Swedish/verbs/query_verbs.sparql      |  3 ++-
 .../languages/Tajik/nouns/query_nouns.sparql        |  5 +++--
 .../languages/Tajik/verbs/query_verbs.sparql        |  6 ++++--
 .../languages/Tamil/nouns/query_nouns.sparql        |  5 +++--
 .../languages/Tamil/verbs/query_verbs.sparql        |  6 ++++--
 .../languages/Ukranian/nouns/query_nouns.sparql     |  7 +++++--
 .../Ukranian/prepositions/query_prepositions.sparql |  6 ++++--
 .../languages/Ukranian/verbs/query_verbs.sparql     |  6 ++++--
 .../languages/Urdu/nouns/query_nouns.sparql         |  6 ++++--
 .../languages/Urdu/verbs/query_verbs.sparql         |  6 ++++--
 81 files changed, 311 insertions(+), 148 deletions(-)
 create mode 100644 src/scribe_data/extract_transform/languages/Greek/verbs/query_verbs.sparql

diff --git a/src/scribe_data/extract_transform/languages/Arabic/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Arabic/nouns/query_nouns.sparql
index b551dd877..04670b010 100644
--- a/src/scribe_data/extract_transform/languages/Arabic/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Arabic/nouns/query_nouns.sparql
@@ -1,10 +1,11 @@
 # All Arabic (Q13955) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun WHERE {
+  ?noun
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Arabic/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Arabic/verbs/query_verbs.sparql
index 03e1e3696..ad46f390b 100644
--- a/src/scribe_data/extract_transform/languages/Arabic/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Arabic/verbs/query_verbs.sparql
@@ -1,9 +1,10 @@
 # All Arabic (Q13955) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb 
+  ?verb
+
 WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q13955 ;
diff --git a/src/scribe_data/extract_transform/languages/Basque/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Basque/nouns/query_nouns.sparql
index ffc7aa0b1..9c5839ad4 100644
--- a/src/scribe_data/extract_transform/languages/Basque/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Basque/nouns/query_nouns.sparql
@@ -1,10 +1,11 @@
 # All Basque (Q8752) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun WHERE {
+  ?noun
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Basque/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Basque/verbs/query_verbs.sparql
index 9bf0167f0..e01d99b53 100644
--- a/src/scribe_data/extract_transform/languages/Basque/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Basque/verbs/query_verbs.sparql
@@ -1,9 +1,10 @@
 # All Basque (Q8752) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb 
+  ?verb
+
 WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q8752 ;
diff --git a/src/scribe_data/extract_transform/languages/Bengali/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Bengali/nouns/query_nouns.sparql
index 9bbf8ea0e..083e75821 100644
--- a/src/scribe_data/extract_transform/languages/Bengali/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Bengali/nouns/query_nouns.sparql
@@ -1,10 +1,11 @@
 # All Bengali (Q9610) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun WHERE {
+  ?noun
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Bengali/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Bengali/verbs/query_verbs.sparql
index 0d160dfbc..837e87dde 100644
--- a/src/scribe_data/extract_transform/languages/Bengali/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Bengali/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Bengali (Q9610) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9610 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git "a/src/scribe_data/extract_transform/languages/Bokm\303\245l/nouns/query_nouns.sparql" "b/src/scribe_data/extract_transform/languages/Bokm\303\245l/nouns/query_nouns.sparql"
index 660232fad..a1ffc4f78 100644
--- "a/src/scribe_data/extract_transform/languages/Bokm\303\245l/nouns/query_nouns.sparql"
+++ "b/src/scribe_data/extract_transform/languages/Bokm\303\245l/nouns/query_nouns.sparql"
@@ -2,9 +2,12 @@
 # Enter this query at https://query.wikidata.org/.
 # Note that this query is for Bokmål (Q25167) rather than Nynorsk (Q25164).
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender 
+  ?singular
+  ?plural
+  ?gender
+
 WHERE {
 
   # Nouns and pronouns.
diff --git "a/src/scribe_data/extract_transform/languages/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/extract_transform/languages/Bokm\303\245l/verbs/query_verbs.sparql"
index 6bd8ac966..087cfe078 100644
--- "a/src/scribe_data/extract_transform/languages/Bokm\303\245l/verbs/query_verbs.sparql"
+++ "b/src/scribe_data/extract_transform/languages/Bokm\303\245l/verbs/query_verbs.sparql"
@@ -2,9 +2,10 @@
 # Enter this query at https://query.wikidata.org/.
 # Note that this query is for Bokmål (Q25167) rather than Nynorsk (Q25164).
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?infinitive 
+  ?infinitive
+
 WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q25167 ;
diff --git a/src/scribe_data/extract_transform/languages/Czech/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Czech/nouns/query_nouns.sparql
index 4aed9ceff..7247d3992 100644
--- a/src/scribe_data/extract_transform/languages/Czech/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Czech/nouns/query_nouns.sparql
@@ -1,9 +1,12 @@
 # All Czeck (Q9056) nouns, their plural, and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender 
+  ?singular
+  ?plural
+  ?gender
+
 WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
diff --git a/src/scribe_data/extract_transform/languages/Czech/prepositions/query_prepositions.sparql b/src/scribe_data/extract_transform/languages/Czech/prepositions/query_prepositions.sparql
index 8c02aaae9..f93098bca 100644
--- a/src/scribe_data/extract_transform/languages/Czech/prepositions/query_prepositions.sparql
+++ b/src/scribe_data/extract_transform/languages/Czech/prepositions/query_prepositions.sparql
@@ -1,9 +1,11 @@
 # All Czech (Q9056) prepositions and their corresponding cases.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?preposition ?case
+  ?preposition
+  ?case
+
 WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9056 ;
diff --git a/src/scribe_data/extract_transform/languages/Czech/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Czech/verbs/query_verbs.sparql
index 8ea432fc3..bba56d961 100644
--- a/src/scribe_data/extract_transform/languages/Czech/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Czech/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Czech (Q9056) verbs and the currently implemented tenses for each.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?infinitive WHERE {
+  ?infinitive
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9056 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Danish/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Danish/nouns/query_nouns.sparql
index 4041d63a5..607694a39 100644
--- a/src/scribe_data/extract_transform/languages/Danish/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Danish/nouns/query_nouns.sparql
@@ -1,10 +1,13 @@
 # All Danish (Q9035) nouns, their plural and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular
+  ?plural
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Danish/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Danish/verbs/query_verbs.sparql
index 9bf4a4785..50e76ddc9 100644
--- a/src/scribe_data/extract_transform/languages/Danish/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Danish/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Danish (Q9035) verbs and the currently implemented tenses for each.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?infinitive WHERE {
+  ?infinitive
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9035 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/English/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/English/nouns/query_nouns.sparql
index a446f0e50..eb9115ff2 100644
--- a/src/scribe_data/extract_transform/languages/English/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/English/nouns/query_nouns.sparql
@@ -1,10 +1,12 @@
 # All English (Q1860) nouns and their plural.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural WHERE {
+  ?singular
+  ?plural
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/English/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/English/verbs/query_verbs.sparql
index 24c7de963..830defd95 100644
--- a/src/scribe_data/extract_transform/languages/English/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/English/verbs/query_verbs.sparql
@@ -1,9 +1,15 @@
 # All English (Q1860) verbs and the currently implemented tenses for each.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT  
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?infinitive ?presFPS ?presTPS ?simpPast ?pastPart WHERE {
+  ?infinitive
+  ?presFPS
+  ?presTPS
+  ?simpPast
+  ?pastPart
+
+WHERE {
   # Infinitive (required)
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q1860 ;
diff --git a/src/scribe_data/extract_transform/languages/Esperanto/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Esperanto/nouns/query_nouns.sparql
index 110cbbc2a..e503ebb58 100644
--- a/src/scribe_data/extract_transform/languages/Esperanto/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Esperanto/nouns/query_nouns.sparql
@@ -1,10 +1,12 @@
 # All Esperanto (Q143) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
-  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID) 
-  ?singular ?plural WHERE {
+SELECT DISTINCT
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
+  ?singular
+  ?plural
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Esperanto/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Esperanto/verbs/query_verbs.sparql
index 3b1ff8d8d..d63dc86f0 100644
--- a/src/scribe_data/extract_transform/languages/Esperanto/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Esperanto/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Esperanto (Q143) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q143 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Estonian/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Estonian/nouns/query_nouns.sparql
index 271a65faa..154815f2a 100644
--- a/src/scribe_data/extract_transform/languages/Estonian/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Estonian/nouns/query_nouns.sparql
@@ -1,10 +1,12 @@
 # All Estonian (Q9072) nouns and their plural.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural WHERE {
+  ?singular
+  ?plural
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Estonian/prepositions/query_prepositions.sparql b/src/scribe_data/extract_transform/languages/Estonian/prepositions/query_prepositions.sparql
index df07b9887..7e6e9ddf4 100644
--- a/src/scribe_data/extract_transform/languages/Estonian/prepositions/query_prepositions.sparql
+++ b/src/scribe_data/extract_transform/languages/Estonian/prepositions/query_prepositions.sparql
@@ -2,10 +2,12 @@
 # Enter this query at https://query.wikidata.org/.
 # Note that this query includes postpositions that are also used in Estonian.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?preposition ?case WHERE {
+  ?preposition
+  ?case
 
+WHERE {
   # Prepositions and postpositions.
   VALUES ?PrePostPositions { wd:Q4833830 wd:Q161873 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Estonian/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Estonian/verbs/query_verbs.sparql
index 16a21ad39..877ed0fa0 100644
--- a/src/scribe_data/extract_transform/languages/Estonian/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Estonian/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Estonian (Q9072) verbs and the currently implemented tenses for each.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?infinitive  WHERE {
+  ?infinitive
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9072 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Finnish/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Finnish/nouns/query_nouns.sparql
index f7098fe9c..acdab8787 100644
--- a/src/scribe_data/extract_transform/languages/Finnish/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Finnish/nouns/query_nouns.sparql
@@ -1,10 +1,12 @@
 # All Finnish (Q1412) nouns and their plural.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural WHERE {
+  ?singular
+  ?plural
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Finnish/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Finnish/verbs/query_verbs.sparql
index db8feb9aa..31702a9ea 100644
--- a/src/scribe_data/extract_transform/languages/Finnish/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Finnish/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Finnish (Q1412) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q1412 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/French/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/French/nouns/query_nouns.sparql
index 5744ea30f..49fdba90d 100644
--- a/src/scribe_data/extract_transform/languages/French/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/French/nouns/query_nouns.sparql
@@ -1,10 +1,13 @@
 # All French (Q150) nouns, their plural and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular
+  ?plural
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/French/verbs/query_verbs_1.sparql b/src/scribe_data/extract_transform/languages/French/verbs/query_verbs_1.sparql
index de5b98209..fbd44fc1d 100644
--- a/src/scribe_data/extract_transform/languages/French/verbs/query_verbs_1.sparql
+++ b/src/scribe_data/extract_transform/languages/French/verbs/query_verbs_1.sparql
@@ -7,8 +7,9 @@ SELECT
   ?presFPS ?presSPS ?presTPS
   ?presFPP ?presSPP ?presTPP
   ?pretFPS ?pretSPS ?pretTPS
-  ?pretFPP ?pretSPP ?pretTPP WHERE {
+  ?pretFPP ?pretSPP ?pretTPP
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q150 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/French/verbs/query_verbs_2.sparql b/src/scribe_data/extract_transform/languages/French/verbs/query_verbs_2.sparql
index 355906c69..245ced3f0 100644
--- a/src/scribe_data/extract_transform/languages/French/verbs/query_verbs_2.sparql
+++ b/src/scribe_data/extract_transform/languages/French/verbs/query_verbs_2.sparql
@@ -7,8 +7,9 @@ SELECT
   ?impFPS ?impSPS ?impTPS
   ?impFPP ?impSPP ?impTPP
   ?futFPS ?futSPS ?futTPS
-  ?futFPP ?futSPP ?futTPP WHERE {
+  ?futFPP ?futSPP ?futTPP
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q150 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/German/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/German/nouns/query_nouns.sparql
index 827db3cb5..b9a081f55 100644
--- a/src/scribe_data/extract_transform/languages/German/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/German/nouns/query_nouns.sparql
@@ -1,10 +1,13 @@
 # All German (Q188) nouns, their plural and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular
+  ?plural
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/German/prepositions/query_prepositions.sparql b/src/scribe_data/extract_transform/languages/German/prepositions/query_prepositions.sparql
index 1eb8f4fc3..10a16d60e 100644
--- a/src/scribe_data/extract_transform/languages/German/prepositions/query_prepositions.sparql
+++ b/src/scribe_data/extract_transform/languages/German/prepositions/query_prepositions.sparql
@@ -1,10 +1,12 @@
 # All German (Q188) prepositions and their corresponding cases.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?preposition ?case WHERE {
+  ?preposition
+  ?case
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q188 ;
     wikibase:lexicalCategory wd:Q4833830 ;
diff --git a/src/scribe_data/extract_transform/languages/German/verbs/query_verbs_1.sparql b/src/scribe_data/extract_transform/languages/German/verbs/query_verbs_1.sparql
index 44ffc7a28..54d2fb581 100644
--- a/src/scribe_data/extract_transform/languages/German/verbs/query_verbs_1.sparql
+++ b/src/scribe_data/extract_transform/languages/German/verbs/query_verbs_1.sparql
@@ -6,8 +6,9 @@ SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
   ?infinitive
   ?presFPS ?presSPS ?presTPS
-  ?presFPP ?presSPP ?presTPP WHERE {
+  ?presFPP ?presSPP ?presTPP
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q188 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/German/verbs/query_verbs_2.sparql b/src/scribe_data/extract_transform/languages/German/verbs/query_verbs_2.sparql
index 3bbc97a36..23e96c539 100644
--- a/src/scribe_data/extract_transform/languages/German/verbs/query_verbs_2.sparql
+++ b/src/scribe_data/extract_transform/languages/German/verbs/query_verbs_2.sparql
@@ -6,8 +6,9 @@ SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
   ?infinitive ?pastParticiple ?auxiliaryVerb
   ?pretFPS ?pretSPS ?pretTPS
-  ?pretFPP ?pretSPP ?pretTPP WHERE {
+  ?pretFPP ?pretSPP ?pretTPP
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q188 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Greek/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Greek/nouns/query_nouns.sparql
index 91a4a6497..eb1021760 100644
--- a/src/scribe_data/extract_transform/languages/Greek/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Greek/nouns/query_nouns.sparql
@@ -1,10 +1,13 @@
 # All Greek (Q36510) nouns, their plural and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular
+  ?plural
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Greek/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Greek/verbs/query_verbs.sparql
new file mode 100644
index 000000000..c1fdffdd9
--- /dev/null
+++ b/src/scribe_data/extract_transform/languages/Greek/verbs/query_verbs.sparql
@@ -0,0 +1,13 @@
+# All Greek (Q36510) verbs.
+# Enter this query at https://query.wikidata.org/.
+
+SELECT
+  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
+  ?verb
+
+WHERE {
+  ?lexeme a ontolex:LexicalEntry ;
+    dct:language wd:Q36510 ;
+    wikibase:lexicalCategory wd:Q24905 ;
+    wikibase:lemma ?verb .
+}
diff --git a/src/scribe_data/extract_transform/languages/Hausa/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Hausa/nouns/query_nouns.sparql
index c8279cb69..0c215ed31 100644
--- a/src/scribe_data/extract_transform/languages/Hausa/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Hausa/nouns/query_nouns.sparql
@@ -1,10 +1,12 @@
 # All Hausa (Q56475) nouns and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun ?gender WHERE {
+  ?noun
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Hausa/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Hausa/verbs/query_verbs.sparql
index 2b2a0f2e9..5e4b743c4 100644
--- a/src/scribe_data/extract_transform/languages/Hausa/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Hausa/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Hausa (Q56475) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT   
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q56475 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Hebrew/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Hebrew/nouns/query_nouns.sparql
index 5a9923800..814343f1f 100644
--- a/src/scribe_data/extract_transform/languages/Hebrew/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Hebrew/nouns/query_nouns.sparql
@@ -1,10 +1,12 @@
 # All Hebrew (Q9288) nouns and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun ?gender WHERE {
+  ?noun
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Hebrew/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Hebrew/verbs/query_verbs.sparql
index fe8f431fa..e0794d6b6 100644
--- a/src/scribe_data/extract_transform/languages/Hebrew/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Hebrew/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Hebrew (Q9288) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT   
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9288 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Hindi/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Hindi/nouns/query_nouns.sparql
index 43c5c3d4a..bedd3446e 100644
--- a/src/scribe_data/extract_transform/languages/Hindi/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Hindi/nouns/query_nouns.sparql
@@ -2,10 +2,12 @@
 # Enter this query at https://query.wikidata.org/.
 # Note the necessity to filter for "hi" to remove Urdu (ur) words.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun ?gender WHERE {
+  ?noun
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Hindi/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Hindi/verbs/query_verbs.sparql
index fa4a7e24d..5e831b100 100644
--- a/src/scribe_data/extract_transform/languages/Hindi/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Hindi/verbs/query_verbs.sparql
@@ -2,9 +2,11 @@
 # Enter this query at https://query.wikidata.org/.
 # Note the necessity to filter for "hi" to remove Urdu (ur) words.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q11051 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Indonesian/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Indonesian/nouns/query_nouns.sparql
index 04f7aa695..cc3184c2e 100644
--- a/src/scribe_data/extract_transform/languages/Indonesian/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Indonesian/nouns/query_nouns.sparql
@@ -1,10 +1,11 @@
 # All Indonesian (Q9240) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun WHERE {
+  ?noun
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Indonesian/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Indonesian/verbs/query_verbs.sparql
index 47b515418..d6b6af32d 100644
--- a/src/scribe_data/extract_transform/languages/Indonesian/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Indonesian/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Indonesian (Q9240) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9240 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Italian/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Italian/nouns/query_nouns.sparql
index d2d6c3972..e313752e5 100644
--- a/src/scribe_data/extract_transform/languages/Italian/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Italian/nouns/query_nouns.sparql
@@ -1,10 +1,13 @@
 # All Italian (Q652) nouns, their plural and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular
+  ?plural
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Italian/verbs/query_verbs_1.sparql b/src/scribe_data/extract_transform/languages/Italian/verbs/query_verbs_1.sparql
index 97fa9718b..662d18094 100644
--- a/src/scribe_data/extract_transform/languages/Italian/verbs/query_verbs_1.sparql
+++ b/src/scribe_data/extract_transform/languages/Italian/verbs/query_verbs_1.sparql
@@ -7,8 +7,9 @@ SELECT
   ?presFPS ?presSPS ?presTPS
   ?presFPP ?presSPP ?presTPP
   ?pretFPS ?pretSPS ?pretTPS
-  ?pretFPP ?pretSPP ?pretTPP WHERE {
+  ?pretFPP ?pretSPP ?pretTPP
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q652 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Italian/verbs/query_verbs_2.sparql b/src/scribe_data/extract_transform/languages/Italian/verbs/query_verbs_2.sparql
index 18c182567..40d7d3bab 100644
--- a/src/scribe_data/extract_transform/languages/Italian/verbs/query_verbs_2.sparql
+++ b/src/scribe_data/extract_transform/languages/Italian/verbs/query_verbs_2.sparql
@@ -5,8 +5,9 @@ SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
   ?infinitive
   ?impFPS ?impSPS ?impTPS
-  ?impFPP ?impSPP ?impTPP WHERE {
+  ?impFPP ?impSPP ?impTPP
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q652 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Japanese/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Japanese/nouns/query_nouns.sparql
index 00bd58744..9dccba559 100644
--- a/src/scribe_data/extract_transform/languages/Japanese/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Japanese/nouns/query_nouns.sparql
@@ -1,10 +1,11 @@
 # All Japanese (Q5287) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun WHERE {
+  ?noun
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Japanese/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Japanese/verbs/query_verbs.sparql
index fae2992cc..0e1071a8d 100644
--- a/src/scribe_data/extract_transform/languages/Japanese/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Japanese/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Japanese (Q5287) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q5287 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Kurmanji/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Kurmanji/nouns/query_nouns.sparql
index 13c35e1c3..d68ce0941 100644
--- a/src/scribe_data/extract_transform/languages/Kurmanji/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Kurmanji/nouns/query_nouns.sparql
@@ -1,10 +1,12 @@
 # All Kurmanji (Q36163) nouns and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun ?gender WHERE {
+  ?noun
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Kurmanji/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Kurmanji/verbs/query_verbs.sparql
index 4431865c5..5cf23802e 100644
--- a/src/scribe_data/extract_transform/languages/Kurmanji/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Kurmanji/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Kurmanji (Q36163) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q36163 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Latin/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Latin/nouns/query_nouns.sparql
index 829b5cae1..4e6913d1f 100644
--- a/src/scribe_data/extract_transform/languages/Latin/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Latin/nouns/query_nouns.sparql
@@ -1,10 +1,12 @@
 # All Latin (Q397) nouns and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun ?gender WHERE {
+  ?noun
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Latin/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Latin/verbs/query_verbs.sparql
index 353919cb7..aa7213961 100644
--- a/src/scribe_data/extract_transform/languages/Latin/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Latin/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Latin (Q397) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q397 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Malay/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Malay/nouns/query_nouns.sparql
index 2e8509701..02e78172b 100644
--- a/src/scribe_data/extract_transform/languages/Malay/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Malay/nouns/query_nouns.sparql
@@ -1,10 +1,11 @@
 # All Malay (Q9237) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun WHERE {
+  ?noun
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Malay/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Malay/verbs/query_verbs.sparql
index d300d8cd0..423245cdb 100644
--- a/src/scribe_data/extract_transform/languages/Malay/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Malay/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Malay (Q9237) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9237 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Malayalam/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Malayalam/nouns/query_nouns.sparql
index 360136d66..cefd84fb2 100644
--- a/src/scribe_data/extract_transform/languages/Malayalam/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Malayalam/nouns/query_nouns.sparql
@@ -1,10 +1,11 @@
 # All Malayalam (Q36236) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun WHERE {
+  ?noun
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Malayalam/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Malayalam/verbs/query_verbs.sparql
index aad27e53b..e567822a7 100644
--- a/src/scribe_data/extract_transform/languages/Malayalam/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Malayalam/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Malayalam (Q36236) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q36236 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Mandarin/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Mandarin/nouns/query_nouns.sparql
index 44bee45cc..8e7803af8 100644
--- a/src/scribe_data/extract_transform/languages/Mandarin/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Mandarin/nouns/query_nouns.sparql
@@ -1,10 +1,11 @@
 # All Mandarin Chinese (Q727694) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun WHERE {
+  ?noun
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Mandarin/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Mandarin/verbs/query_verbs.sparql
index 308b382da..52dabbea5 100644
--- a/src/scribe_data/extract_transform/languages/Mandarin/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Mandarin/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Mandarin Chinese (Q727694) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q727694 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Nynorsk/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Nynorsk/nouns/query_nouns.sparql
index 9a704235b..f095e54e8 100644
--- a/src/scribe_data/extract_transform/languages/Nynorsk/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Nynorsk/nouns/query_nouns.sparql
@@ -2,10 +2,13 @@
 # Enter this query at https://query.wikidata.org/.
 # Note that this query is for Nynorsk (Q25164) rather than Bokmål (Q25167).
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular
+  ?plural
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Nynorsk/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Nynorsk/verbs/query_verbs.sparql
index 1cbbac503..dc80791b8 100644
--- a/src/scribe_data/extract_transform/languages/Nynorsk/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Nynorsk/verbs/query_verbs.sparql
@@ -2,9 +2,11 @@
 # Enter this query at https://query.wikidata.org/.
 # Note that this query is for Nynorsk (Q25164) rather than Bokmål (Q25167).
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?infinitive WHERE {
+  ?infinitive
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q25164 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Polish/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Polish/nouns/query_nouns.sparql
index 644c22060..cdb344ff1 100644
--- a/src/scribe_data/extract_transform/languages/Polish/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Polish/nouns/query_nouns.sparql
@@ -1,10 +1,13 @@
 # All Polish (Q809) nouns, their plural and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular
+  ?plural
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Polish/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Polish/verbs/query_verbs.sparql
index 45e098a96..48705b9d0 100644
--- a/src/scribe_data/extract_transform/languages/Polish/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Polish/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Polish (Q809) verbs and the currently implemented tenses for each.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?infinitive  WHERE {
+  ?infinitive
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q809 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Portuguese/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Portuguese/nouns/query_nouns.sparql
index 43fe375c2..58ef19f01 100644
--- a/src/scribe_data/extract_transform/languages/Portuguese/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Portuguese/nouns/query_nouns.sparql
@@ -1,10 +1,13 @@
 # All Portuguese (Q5146) nouns, their plural and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular
+  ?plural
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Portuguese/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Portuguese/verbs/query_verbs.sparql
index 5250cd49c..04d3f0a00 100644
--- a/src/scribe_data/extract_transform/languages/Portuguese/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Portuguese/verbs/query_verbs.sparql
@@ -11,8 +11,9 @@ SELECT DISTINCT
   ?impFPS ?impSPS ?impTPS
   ?impFPP ?impSPP ?impTPP
   ?fSimpFPS ?fSimpSPS ?fSimpTPS
-  ?fSimpFPP ?fSimpSPP ?fSimpTPP WHERE {
+  ?fSimpFPP ?fSimpSPP ?fSimpTPP
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q5146 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Russian/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Russian/nouns/query_nouns.sparql
index 4227918f2..a7708d450 100644
--- a/src/scribe_data/extract_transform/languages/Russian/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Russian/nouns/query_nouns.sparql
@@ -1,10 +1,13 @@
 # All Russian (Q7737) nouns, their plural and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular
+  ?plural
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Russian/prepositions/query_prepositions.sparql b/src/scribe_data/extract_transform/languages/Russian/prepositions/query_prepositions.sparql
index ea13dce77..01a2bbd0a 100644
--- a/src/scribe_data/extract_transform/languages/Russian/prepositions/query_prepositions.sparql
+++ b/src/scribe_data/extract_transform/languages/Russian/prepositions/query_prepositions.sparql
@@ -1,10 +1,12 @@
 # All Russian (Q7737) prepositions and their corresponding cases.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?preposition ?case WHERE {
+  ?preposition
+  ?case
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q7737 ;
     wikibase:lexicalCategory wd:Q4833830 ;
diff --git a/src/scribe_data/extract_transform/languages/Russian/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Russian/verbs/query_verbs.sparql
index 7cafcb93c..5d973dd63 100644
--- a/src/scribe_data/extract_transform/languages/Russian/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Russian/verbs/query_verbs.sparql
@@ -6,8 +6,9 @@ SELECT DISTINCT
   ?infinitive
   ?presFPS ?presSPS ?presTPS
   ?presFPP ?presSPP ?presTPP
-  ?pastFeminine ?pastMasculine ?pastNeutral ?pastPlural WHERE {
+  ?pastFeminine ?pastMasculine ?pastNeutral ?pastPlural
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q7737 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Slovak/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Slovak/nouns/query_nouns.sparql
index 25814c1d7..dd0c82f92 100644
--- a/src/scribe_data/extract_transform/languages/Slovak/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Slovak/nouns/query_nouns.sparql
@@ -1,10 +1,11 @@
 # All Slovak (Q9058) nouns, their plural and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular ?plural ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Slovak/prepositions/query_prepositions.sparql b/src/scribe_data/extract_transform/languages/Slovak/prepositions/query_prepositions.sparql
index 7dacf7b3a..27a793fa1 100644
--- a/src/scribe_data/extract_transform/languages/Slovak/prepositions/query_prepositions.sparql
+++ b/src/scribe_data/extract_transform/languages/Slovak/prepositions/query_prepositions.sparql
@@ -1,10 +1,11 @@
 # All Slovak (Q9058) prepositions and their corresponding cases.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?preposition ?case WHERE {
+  ?preposition ?case
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9058 ;
     wikibase:lexicalCategory wd:Q4833830 ;
diff --git a/src/scribe_data/extract_transform/languages/Slovak/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Slovak/verbs/query_verbs.sparql
index d30d49147..04620ffa3 100644
--- a/src/scribe_data/extract_transform/languages/Slovak/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Slovak/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Slovak (Q9058) verbs and the currently implemented tenses for each.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?infinitive  WHERE {
+  ?infinitive
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9058 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Spanish/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Spanish/nouns/query_nouns.sparql
index 9c82e5570..b243abb61 100644
--- a/src/scribe_data/extract_transform/languages/Spanish/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Spanish/nouns/query_nouns.sparql
@@ -1,10 +1,13 @@
 # All Spanish (Q1321) nouns, their plural and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular
+  ?plural
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_1.sparql b/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_1.sparql
index d3987956a..97cf46273 100644
--- a/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_1.sparql
+++ b/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_1.sparql
@@ -5,8 +5,10 @@ SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
   ?infinitive
   ?presFPS ?presSPS ?presTPS
-  ?presFPP ?presSPP ?presTPP WHERE {
+  ?presFPP ?presSPP ?presTPP
 
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q1321 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_2.sparql b/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_2.sparql
index e078e1b64..26856897d 100644
--- a/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_2.sparql
+++ b/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_2.sparql
@@ -5,8 +5,9 @@ SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
   ?infinitive
   ?pretFPS ?pretSPS ?pretTPS
-  ?pretFPP ?pretSPP ?pretTPP WHERE {
+  ?pretFPP ?pretSPP ?pretTPP
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q1321 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_3.sparql b/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_3.sparql
index 0602e9a14..28d688acb 100644
--- a/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_3.sparql
+++ b/src/scribe_data/extract_transform/languages/Spanish/verbs/query_verbs_3.sparql
@@ -5,8 +5,9 @@ SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
   ?infinitive
   ?impFPS ?impSPS ?impTPS
-  ?impFPP ?impSPP ?impTPP WHERE {
+  ?impFPP ?impSPP ?impTPP
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q1321 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Swedish/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Swedish/nouns/query_nouns.sparql
index d17d6b5e0..065d6cb4d 100644
--- a/src/scribe_data/extract_transform/languages/Swedish/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Swedish/nouns/query_nouns.sparql
@@ -6,8 +6,9 @@
 SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
   ?nominativeSingular ?nominativePlural
-  ?genitiveSingular ?genitivePlural ?gender WHERE {
+  ?genitiveSingular ?genitivePlural ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Swedish/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Swedish/verbs/query_verbs.sparql
index cfbd09ad5..58a32ef5b 100644
--- a/src/scribe_data/extract_transform/languages/Swedish/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Swedish/verbs/query_verbs.sparql
@@ -6,8 +6,9 @@ SELECT
   ?activeInfinitive ?imperative ?activeSupine
   ?activePresent ?activePreterite
   ?passiveInfinitive ?passiveSupine
-  ?passivePresent ?passivePreterite WHERE {
+  ?passivePresent ?passivePreterite
 
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9027 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Tajik/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Tajik/nouns/query_nouns.sparql
index 2e8bbd76f..ebe571642 100644
--- a/src/scribe_data/extract_transform/languages/Tajik/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Tajik/nouns/query_nouns.sparql
@@ -1,10 +1,11 @@
 # All Tajik (Q9260) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun WHERE {
+  ?noun
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Tajik/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Tajik/verbs/query_verbs.sparql
index e388fbf93..72ecae452 100644
--- a/src/scribe_data/extract_transform/languages/Tajik/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Tajik/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Tajik (Q9260) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q9260 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Tamil/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Tamil/nouns/query_nouns.sparql
index dee209413..64ba7e420 100644
--- a/src/scribe_data/extract_transform/languages/Tamil/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Tamil/nouns/query_nouns.sparql
@@ -1,10 +1,11 @@
 # All Tamil (Q5885) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun WHERE {
+  ?noun
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Tamil/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Tamil/verbs/query_verbs.sparql
index 770a388f5..11806f7e4 100644
--- a/src/scribe_data/extract_transform/languages/Tamil/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Tamil/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Tamil (Q5885) verbs.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q5885 ;
     wikibase:lexicalCategory wd:Q24905 ;
diff --git a/src/scribe_data/extract_transform/languages/Ukranian/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Ukranian/nouns/query_nouns.sparql
index b8d48f26b..1dfc4f621 100644
--- a/src/scribe_data/extract_transform/languages/Ukranian/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Ukranian/nouns/query_nouns.sparql
@@ -1,10 +1,13 @@
 # All Ukrainian (Q8798) nouns, their plural and their gender.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?singular ?plural ?gender WHERE {
+  ?singular
+  ?plural
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Ukranian/prepositions/query_prepositions.sparql b/src/scribe_data/extract_transform/languages/Ukranian/prepositions/query_prepositions.sparql
index f9d35972a..9b3a420b8 100644
--- a/src/scribe_data/extract_transform/languages/Ukranian/prepositions/query_prepositions.sparql
+++ b/src/scribe_data/extract_transform/languages/Ukranian/prepositions/query_prepositions.sparql
@@ -1,10 +1,12 @@
 # All Ukrainian (Q8798) prepositions and their corresponding cases.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?preposition ?case WHERE {
+  ?preposition
+  ?case
 
+WHERE {
   # All German prepositions.
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q8798 ;
diff --git a/src/scribe_data/extract_transform/languages/Ukranian/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Ukranian/verbs/query_verbs.sparql
index 40a50674e..446326264 100644
--- a/src/scribe_data/extract_transform/languages/Ukranian/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Ukranian/verbs/query_verbs.sparql
@@ -1,9 +1,11 @@
 # All Ukrainian (Q8798) verbs and the currently implemented tenses for each.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?infinitive  WHERE {
+  ?infinitive
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q8798 ;
     wikibase:lexicalCategory wd:Q24905 .
diff --git a/src/scribe_data/extract_transform/languages/Urdu/nouns/query_nouns.sparql b/src/scribe_data/extract_transform/languages/Urdu/nouns/query_nouns.sparql
index da9918406..52e955d4d 100644
--- a/src/scribe_data/extract_transform/languages/Urdu/nouns/query_nouns.sparql
+++ b/src/scribe_data/extract_transform/languages/Urdu/nouns/query_nouns.sparql
@@ -2,10 +2,12 @@
 # Enter this query at https://query.wikidata.org/.
 # Note the necessity to filter for "ur" to remove Hindustani (hi) words.
 
-SELECT DISTINCT 
+SELECT DISTINCT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun ?gender WHERE {
+  ?noun
+  ?gender
 
+WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
diff --git a/src/scribe_data/extract_transform/languages/Urdu/verbs/query_verbs.sparql b/src/scribe_data/extract_transform/languages/Urdu/verbs/query_verbs.sparql
index c05f8e63f..ec14d5dec 100644
--- a/src/scribe_data/extract_transform/languages/Urdu/verbs/query_verbs.sparql
+++ b/src/scribe_data/extract_transform/languages/Urdu/verbs/query_verbs.sparql
@@ -2,9 +2,11 @@
 # Enter this query at https://query.wikidata.org/.
 # Note the necessity to filter for "ur" to remove Hindustani (hi) words.
 
-SELECT 
+SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?verb WHERE {
+  ?verb
+
+WHERE {
   ?lexeme a ontolex:LexicalEntry ;
     dct:language wd:Q11051 ;
     wikibase:lexicalCategory wd:Q24905 ;