diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index a693fa3..822b2d6 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -75,5 +75,5 @@ SELECT roles.*
 FROM roles, ln_canvassers_roles
 WHERE roles.id = ln_canvassers_roles.role_id
 	AND ln_canvassers_roles.canvasser_id = :id
-ORDER BY canvassers.name,
-	canvassers.id
+ORDER BY roles.name,
+	roles.id
diff --git a/resources/templates/base.html b/resources/templates/base.html
index 54b4f02..c14f6de 100644
--- a/resources/templates/base.html
+++ b/resources/templates/base.html
@@ -37,12 +37,12 @@
         </menu>
       </div>
       <h1>{{title}}</h1>
-      {% if message|not-empty %}
+      {% if message %}
       <div class="message">
         {{ message }}
       </div>
       {% endif %}
-      {% if error|not-empty %}
+      {% if error %}
       <div class="error">
         {{ error }}
       </div>