diff --git a/list_state_counterparts.rq b/list_state_counterparts.rq
index d08b8f0..8c8e0b4 100644
--- a/list_state_counterparts.rq
+++ b/list_state_counterparts.rq
@@ -1,3 +1,4 @@
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 # List all states which are values for a character
 PREFIX obo: <http://purl.obolibrary.org/obo/>
 PREFIX ps: <http://purl.org/phenoscape/vocab.owl#>
@@ -5,14 +6,23 @@ PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX owl: <http://www.w3.org/2002/07/owl#>
 PREFIX dc: <http://purl.org/dc/elements/1.1/>
 PREFIX StandardState: <http://purl.obolibrary.org/obo/CDAO_0000045>
+PREFIX StandardCharacter: <http://purl.obolibrary.org/obo/CDAO_0000075>
 PREFIX bd: <http://www.bigdata.com/rdf/search#>
-# replace the value of the following prefix with the character URI of interest
-PREFIX character: <http://purl.org/phenoscape/uuid/61c0481d-0f82-4b32-97b1-5b8c8f2eece3>
+PREFIX hint: <http://www.bigdata.com/queryHints#>
 
-SELECT DISTINCT ?state ?state_label
+SELECT DISTINCT ?character_label ?state ?state_label
 FROM <http://kb.phenoscape.org/>
 WHERE 
 { 
-character: ps:may_have_state_value ?state .
+?character ps:may_have_state_value ?state .
 ?state dc:description ?state_label .
+?character rdfs:label ?character_label
+ {
+    # This subselect grabs a random character state. Replace
+    # ?character_state in the above with a specific URI if desired.
+    SELECT ?character WHERE {
+    ?character rdf:type StandardCharacter:
+  } LIMIT 1
+  }
+  hint:Prior hint:runFirst true .
 }