--- a/src/p4l/settings.py	Tue Sep 10 10:57:45 2013 +0200
+++ b/src/p4l/settings.py	Tue Sep 10 12:14:52 2013 +0200
@@ -185,10 +185,10 @@
     ?uri a skos:Concept.
     ?uri skos:inScheme <http://skos.um.es/unescothes/CS000> .
     ?uri skos:prefLabel ?label.
-    FILTER (lang(?label) = ?language).
+    FILTER (lang(?label) = %s).
     ?uri skos:prefLabel ?lab.
     FILTER regex (str(?lab), ?reg, 'i').
-    FILTER (lang (?lab) = ?language).
+    FILTER (lang (?lab) = %s).
     BIND (STRLEN(STRBEFORE (str(?lab), ?reg)) AS ?place).
     BIND (STRLEN(STR(?lab)) AS ?len)
 }
@@ -204,7 +204,7 @@
     ?uri a skos:Collection ;
     skos:inScheme <http://skos.um.es/unescothes/CS000> ;    
     skos:prefLabel|rdfs:label ?label .
-    FILTER (lang(?label) = ?language). 
+    FILTER (lang(?label) = %s). 
     FILTER NOT EXISTS { [skos:member ?uri] }
 }
 """,
@@ -220,7 +220,7 @@
     FILTER (?type = skos:Collection || ?type = skos:Concept) }.
   ?root skos:narrower|skos:member ?uri.
   ?uri skos:prefLabel|rdfs:label ?label.
-  FILTER (lang(?label) = ?language).
+  FILTER (lang(?label) = %s).
 }
 """,
 "child-count" : """
@@ -246,10 +246,10 @@
     ?uri a skos:Concept.
     ?uri skos:inScheme <http://www.iiep.unesco.org/plan4learning/scheme/Themes> .
     ?uri skos:prefLabel ?label.
-    FILTER (lang(?label) = ?language).
+    FILTER (lang(?label) = %s).
     ?uri skos:prefLabel ?lab.
     FILTER regex (str(?lab), ?reg, 'i').
-    FILTER (lang (?lab) = ?language).
+    FILTER (lang (?lab) = %s).
     BIND (STRLEN(STRBEFORE (str(?lab), ?reg)) AS ?place).
     BIND (STRLEN(STR(?lab)) AS ?len)
 }
@@ -265,7 +265,7 @@
     ?uri a skos:Concept ;
     skos:inScheme <http://www.iiep.unesco.org/plan4learning/scheme/Themes> ;    
     skos:prefLabel ?label .
-    FILTER (lang(?label) = ?language). 
+    FILTER (lang(?label) = %s). 
     FILTER NOT EXISTS { [skos:narrower ?uri] }
 }
 """,
@@ -281,7 +281,7 @@
     FILTER (?type = skos:Collection || ?type = skos:Concept) }.
   ?root skos:narrower|skos:member ?uri.
   ?uri skos:prefLabel|rdfs:label ?label.
-  FILTER (lang(?label) = ?language).
+  FILTER (lang(?label) = %s).
 }
 """,
 'child-count' : """