diff --git a/src/scribe_data/language_data_extraction/Pidgin/Nigerian/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Pidgin/Nigerian/nouns/query_nouns.sparql
index 7373b0aa..c6565639 100644
--- a/src/scribe_data/language_data_extraction/Pidgin/Nigerian/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Pidgin/Nigerian/nouns/query_nouns.sparql
@@ -1,5 +1,5 @@
 # tool: scribe-data
-# All Nigerian Pidgin (Q33655) nouns and their gender.
+# All Nigerian Pidgin (Q33655) nouns, their plurals and their genders.
 # Enter this query at https://query.wikidata.org/.
 
 SELECT DISTINCT
@@ -7,30 +7,31 @@ SELECT DISTINCT
   ?singular
   ?plural
   ?gender
+
 WHERE {
-  VALUES ?nounTypes {wd:Q1084} # Nouns
+  VALUES ?nounTypes {wd:Q1084 wd:Q147276} # Nouns and pronouns
 
-  # Main noun data
   ?lexeme dct:language wd:Q33655 ; # Nigerian Pidgin
     wikibase:lexicalCategory ?nounTypes ;
     wikibase:lemma ?singular .
 
-  # Plural form (if exists)
+  # MARK: Plural
+
   OPTIONAL {
     ?lexeme ontolex:lexicalForm ?pluralForm .
     ?pluralForm ontolex:representation ?plural ;
-      wikibase:grammaticalFeature wd:Q146786 ; # Plural
+      wikibase:grammaticalFeature wd:Q146786 ;
   } .
 
-  # Gender (if specified)
+  # MARK: Gender(s)
+
   OPTIONAL {
-    ?lexeme wdt:P5185 ?nounGender . # Grammatical gender
+    ?lexeme wdt:P5185 ?nounGender .
     FILTER NOT EXISTS {
       ?lexeme wdt:P31 wd:Q202444 .
     }
   } .
 
-  # Get readable gender labels
   SERVICE wikibase:label {
     bd:serviceParam wikibase:language "[AUTO_LANGUAGE]".
     ?nounGender rdfs:label ?gender .