--- a/src/p4l/settings.py	Tue Nov 26 23:54:13 2013 +0100
+++ b/src/p4l/settings.py	Mon Dec 02 17:44:50 2013 +0100
@@ -338,7 +338,7 @@
                     "FILTER (lang(?label) = {lang}). " 
                     "FILTER NOT EXISTS {{ [skos:member ?uri] }}. "
                 "}} "
-                "ORDER BY ?label"
+                "ORDER BY str(?label)"
             ),
             "childs" : (
                 "PREFIX skos:<http://www.w3.org/2004/02/skos/core#> "
@@ -354,7 +354,7 @@
                   "?uri skos:prefLabel|rdfs:label ?label. "
                   "FILTER (lang(?label) = {lang}). "
                 "}} "
-                "ORDER BY ?label"
+                "ORDER BY str(?label)"
             ),
             "child-count" : (
                 "PREFIX skos:<http://www.w3.org/2004/02/skos/core#> "
@@ -403,7 +403,7 @@
                     "FILTER (lang(?label) = {lang}). " 
                     "FILTER NOT EXISTS {{ [skos:member ?uri] }} "
                 "}} "
-                "ORDER BY ?label"
+                "ORDER BY str(?label)"
             ),
             'childs' : (
                 "PREFIX skos:<http://www.w3.org/2004/02/skos/core#> "
@@ -419,7 +419,7 @@
                   "?uri skos:prefLabel|rdfs:label ?label. "
                   "FILTER (lang(?label) = {lang}). "
                 "}} "
-                "ORDER BY ?label "
+                "ORDER BY str(?label)"
             ),
             'child-count' : (
                 "PREFIX skos:<http://www.w3.org/2004/02/skos/core#> "
@@ -467,7 +467,7 @@
                     "FILTER (lang(?label) = {lang}). " 
                     "FILTER NOT EXISTS {{ [skos:narrower ?uri] }} "
                 "}} "
-                "ORDER BY ?label "
+                "ORDER BY str(?label)"
             ),
             'childs' : (
                 "PREFIX skos:<http://www.w3.org/2004/02/skos/core#> "
@@ -483,7 +483,7 @@
                   "?uri skos:prefLabel|rdfs:label ?label. "
                   "FILTER (lang(?label) = {lang}). "
                 "}} "
-                "ORDER BY ?label"
+                "ORDER BY str(?label)"
             ),
             'child-count' : (
                 "PREFIX skos:<http://www.w3.org/2004/02/skos/core#> "
@@ -531,7 +531,7 @@
                     "FILTER (lang(?label) = {lang}).  "
                     "FILTER NOT EXISTS {{ [skos:narrower ?uri] }} "
                 "}} "
-                "ORDER BY ?label"
+                "ORDER BY str(?label)"
             )
         },
         'projects': {
@@ -546,7 +546,7 @@
                     "?uri a skos:Concept. "
                     "?uri skos:inScheme <http://www.iiep.unesco.org/plan4learning/scheme/Projects> . "
                     "?uri skos:prefLabel ?label. "
-                    "?uri skos:prefLabel ?lab. "
+                    "?uri skos:prefLabel|skos:altLabel ?lab. "
                     "OPTIONAL {{ ?uri skos:altLabel ?acro }}. "
                     "FILTER regex (str(?lab), ?reg, 'i'). "
                     "BIND (STRLEN(STRBEFORE (str(?lab), ?reg)) AS ?place). "
@@ -566,7 +566,7 @@
                     "skos:prefLabel ?label . "
                     "OPTIONAL {{ ?uri skos:altLabel ?acro }} "
                 "}} "
-                "ORDER BY ?label"
+                "ORDER BY str(?label)"
             )
         },
         'organizations': {
@@ -581,7 +581,7 @@
                     "?uri a skos:Concept. "
                     "?uri skos:inScheme <http://www.iiep.unesco.org/plan4learning/scheme/Organizations> . "
                     "?uri skos:prefLabel ?label. "
-                    "?uri skos:prefLabel ?lab. "
+                    "?uri skos:prefLabel|skos:altLabel ?lab. "
                     "OPTIONAL {{ ?uri skos:altLabel ?acro }}. "
                     "FILTER regex (str(?lab), ?reg, 'i'). "
                     "BIND (STRLEN(STRBEFORE (str(?lab), ?reg)) AS ?place). "
@@ -601,7 +601,7 @@
                          "skos:prefLabel ?label . "
                     "OPTIONAL {{ ?uri skos:altLabel ?acro }} "
                 "}} "
-                "ORDER BY ?label"
+                "ORDER BY str(?label)"
             )
         },
         'types': {
@@ -638,7 +638,7 @@
                     "FILTER (lang(?label) = {lang}).  "
                     "FILTER NOT EXISTS {{ [skos:narrower ?uri] }} "
                 "}} "
-                "ORDER BY ?label "
+                "ORDER BY str(?label)"
             )
         },
         'audiences': {