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 9dccba559..2f445c0f9 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,11 +1,12 @@
+PREFIX wikibase: <http://wikiba.se/ontology#>
+PREFIX dct: <http://purl.org/dc/terms/>
+PREFIX ontolex: <http://www.w3.org/ns/lemon/ontolex#>
+PREFIX wd: <http://www.wikidata.org/entity/>
 # All Japanese (Q5287) nouns.
 # Enter this query at https://query.wikidata.org/.
 
-SELECT DISTINCT
-  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)
-  ?noun
+SELECT (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") as ?lexemeID)  ?noun WHERE {
 
-WHERE {
   # Nouns and pronouns.
   VALUES ?nounTypes { wd:Q1084 wd:Q147276 }
   ?lexeme a ontolex:LexicalEntry ;
@@ -15,6 +16,5 @@ WHERE {
   FILTER(?nounType = ?nounTypes)
 
   BIND(lang(?noun) as ?language)
-  FILTER(?language = "ja-hira")
-  # FILTER(?language = "ja")
+  FILTER(CONTAINS(?language, "ja-hira") || CONTAINS(?language, "ja") || CONTAINS(?language, "ja-kana"))
 }