From 5356f65ca36c71352d0daaf16b12f91a22261f65 Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Tue, 10 Jul 2018 16:20:48 +0100
Subject: [PATCH] Much UI work, significant improvement.

---
 project.clj                                   |   11 +-
 resources/sql/queries.auto.sql                |   17 +-
 resources/sql/youyesyet.postgres.sql          |   29 +-
 .../templates/auto/application-index.html     |    9 +-
 .../auto/form-addresses-Address.html          |   56 +-
 .../auto/form-authorities-Authority.html      |    2 +-
 .../auto/form-canvassers-Canvasser.html       |  194 +-
 .../auto/form-districts-District.html         |    2 +-
 .../auto/form-dwellings-Dwelling.html         |   56 +-
 .../templates/auto/form-electors-Elector.html |   64 +-
 .../templates/auto/form-events-Events.html    |   36 +-
 .../form-followupactions-Followupaction.html  |  102 +-
 .../form-followupmethods-Followupmethod.html  |    2 +-
 ...form-followuprequests-Followuprequest.html |  133 +-
 .../templates/auto/form-genders-Gender.html   |    2 +-
 .../auto/form-intentions-Intention.html       |  125 +-
 .../templates/auto/form-issues-Issue.html     |   24 +-
 .../templates/auto/form-options-Option.html   |    2 +-
 resources/templates/auto/form-roles-Role.html |   31 +-
 resources/templates/auto/form-teams-Team.html |  178 +-
 .../templates/auto/form-visits-Visit.html     |  113 +-
 .../auto/list-addresses-Addresses.html        |    2 +-
 .../auto/list-authorities-Authorities.html    |    2 +-
 .../auto/list-canvassers-Canvassers.html      |   31 +-
 .../auto/list-districts-Districts.html        |    2 +-
 .../auto/list-dwellings-Dwellings.html        |    2 +-
 .../auto/list-electors-Electors.html          |    2 +-
 .../templates/auto/list-events-Events.html    |    2 +-
 .../list-followupactions-Followupactions.html |   11 +-
 .../list-followupmethods-Followupmethods.html |    2 +-
 ...ist-followuprequests-Followuprequests.html |    4 +-
 .../templates/auto/list-genders-Genders.html  |    2 +-
 .../auto/list-intentions-Intentions.html      |    4 +-
 .../templates/auto/list-issues-Issues.html    |    2 +-
 .../templates/auto/list-options-Options.html  |    2 +-
 .../templates/auto/list-roles-Roles.html      |    2 +-
 .../templates/auto/list-teams-Teams.html      |    2 +-
 .../templates/auto/list-visits-Visits.html    |    2 +-
 resources/templates/base.html                 |    2 +-
 src/clj/youyesyet/layout.clj                  |    5 +-
 src/clj/youyesyet/routes/auto.clj             | 1703 +++++++++++------
 src/clj/youyesyet/routes/auto_json.clj        |    2 +-
 youyesyet.adl.xml                             |   56 +-
 youyesyet.canonical.adl.xml                   |   46 +-
 44 files changed, 1865 insertions(+), 1213 deletions(-)

diff --git a/project.clj b/project.clj
index f253f46..581b5d9 100644
--- a/project.clj
+++ b/project.clj
@@ -53,22 +53,15 @@
   :main ^:skip-aot youyesyet.core
   :migratus {:store :database :db ~(get (System/getenv) "DATABASE_URL")}
 
-  :plugins [[lein-bower "0.5.1"]
-            [lein-cljsbuild "1.1.4"]
+  :plugins [[lein-cljsbuild "1.1.4"]
             [lein-codox "0.10.3"]
             [lein-cprop "1.0.1"]
             [lein-less "1.7.5"]
             [lein-npm "0.6.2"]
             [lein-uberwar "0.2.0"]
             [migratus-lein "0.4.2"]
-            [org.clojars.punkisdead/lein-cucumber "1.0.5"]
-             ]
+            [org.clojars.punkisdead/lein-cucumber "1.0.5"]]
 
-  :bower-dependencies [[leaflet "0.7.3"]
-                       [jquery "3.3.1"]
-                       [datatables.net "1.10.19"]
-                       [datatables.net-dt "1.10.19"]]
-  :bower {:directory "resources/public/js/lib"}
 
   :cucumber-feature-paths ["test/clj/features"]
 
diff --git a/resources/sql/queries.auto.sql b/resources/sql/queries.auto.sql
index 2009302..fa45e72 100644
--- a/resources/sql/queries.auto.sql
+++ b/resources/sql/queries.auto.sql
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------
 --	File queries.sql 
 --	
---	autogenerated by adl.to-hugsql-queries at 2018-07-09T20:55:32.719Z 
+--	autogenerated by adl.to-hugsql-queries at 2018-07-10T15:25:22.228Z 
 --	
 --	See [Application Description 
 --	Language](https://github.com/simon-brooke/adl). 
@@ -343,9 +343,6 @@ ORDER BY dwellings.address_id,
 SELECT * FROM electors
 WHERE electors.id = :id
 ORDER BY electors.name,
-	electors.phone,
-	electors.email,
-	electors.gender,
 	electors.id
 
 -- :name get-event :? :1
@@ -561,9 +558,6 @@ ORDER BY lv_dwellings.address_id,
 -- :doc lists all existing elector records
 SELECT DISTINCT * FROM lv_electors
 ORDER BY lv_electors.name,
-	lv_electors.phone,
-	lv_electors.email,
-	lv_electors.gender,
 	lv_electors.id
 --~ (if (:offset params) "OFFSET :offset ")
 --~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
@@ -575,9 +569,6 @@ FROM lv_electors, electors
 WHERE lv_electors.id = electors.id
 	AND electors.dwelling_id = :id
 ORDER BY lv_electors.name,
-	lv_electors.phone,
-	lv_electors.email,
-	lv_electors.gender,
 	lv_electors.id
 
 -- :name list-electors-by-gender :? :*
@@ -587,9 +578,6 @@ FROM lv_electors, electors
 WHERE lv_electors.id = electors.id
 	AND electors.gender = :id
 ORDER BY lv_electors.name,
-	lv_electors.phone,
-	lv_electors.email,
-	lv_electors.gender,
 	lv_electors.id
 
 -- :name list-events :? :*
@@ -916,9 +904,6 @@ WHERE false
 	--~ (if (:gender params) "OR gender LIKE '%:gender%'")
 	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_electors.name,
-	lv_electors.phone,
-	lv_electors.email,
-	lv_electors.gender,
 	lv_electors.id
 --~ (if (:offset params) "OFFSET :offset ")
 --~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
diff --git a/resources/sql/youyesyet.postgres.sql b/resources/sql/youyesyet.postgres.sql
index f092acb..da16031 100644
--- a/resources/sql/youyesyet.postgres.sql
+++ b/resources/sql/youyesyet.postgres.sql
@@ -5,7 +5,7 @@
 --	
 --	auto-generated by [Application Description Language framework] 
 --	
---	(https://github.com/simon-brooke/adl) at 20180709T205533.789Z 
+--	(https://github.com/simon-brooke/adl) at 20180710T152523.324Z 
 --	
 --	A web-app intended to be used by canvassers
 --	  campaigning for a 'Yes' vote in the second independence
@@ -281,6 +281,9 @@ GRANT DELETE ON followupactions TO admin ;
 
 ------------------------------------------------------------------------
 --	primary table followupmethods for entity followupmethods 
+--	
+--	Methods which may be used to follow up a followup request. Reference 
+--	data. 
 ------------------------------------------------------------------------
 CREATE TABLE followupmethods
 (
@@ -318,8 +321,8 @@ GRANT SELECT ON followuprequests TO admin,
 	teamorganisers ;
 GRANT INSERT ON followuprequests TO admin,
 	canvassers ;
-GRANT UPDATE ON followuprequests TO admin ;
-GRANT DELETE ON followuprequests TO admin ;
+
+
 
 ------------------------------------------------------------------------
 --	primary table genders for entity genders 
@@ -360,8 +363,8 @@ GRANT SELECT ON intentions TO admin,
 	canvassers ;
 GRANT INSERT ON intentions TO admin,
 	canvassers ;
-GRANT UPDATE ON intentions TO admin ;
-GRANT DELETE ON intentions TO admin ;
+
+
 
 ------------------------------------------------------------------------
 --	primary table issues for entity issues 
@@ -530,7 +533,7 @@ SELECT canvassers.username,
 	canvassers.fullname,
 	canvassers.avatar,
 	canvassers.bio,
-	electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| genders.id AS elector_id_expanded,
+	electors.name AS elector_id_expanded,
 	canvassers.elector_id,
 	addresses.address ||', '|| addresses.postcode AS address_id_expanded,
 	canvassers.address_id,
@@ -540,7 +543,7 @@ SELECT canvassers.username,
 	canvassers.authority_id,
 	canvassers.authorised,
 	canvassers.id
-FROM canvassers, authorities, addresses, genders, electors
+FROM canvassers, authorities, addresses, electors
 WHERE canvassers.elector_id = electors.id
 	AND canvassers.address_id = addresses.id
 	AND canvassers.authority_id = authorities.id
@@ -633,7 +636,7 @@ GRANT SELECT ON lv_events TO admin,
 --	lists, et cetera 
 ------------------------------------------------------------------------
 CREATE VIEW lv_followupactions AS
-SELECT electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| genders.id ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| visits.date ||', '|| issues.id AS request_id_expanded,
+SELECT electors.name ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| visits.date ||', '|| issues.id AS request_id_expanded,
 	followupactions.request_id,
 	canvassers.username ||', '|| canvassers.fullname ||', '|| addresses.address ||', '|| addresses.postcode ||', '|| canvassers.phone ||', '|| canvassers.email AS actor_expanded,
 	followupactions.actor,
@@ -641,7 +644,7 @@ SELECT electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| ge
 	followupactions.notes,
 	followupactions.closed,
 	followupactions.id
-FROM followuprequests, visits, canvassers, addresses, followupactions, genders, issues, electors
+FROM followuprequests, visits, canvassers, addresses, followupactions, issues, electors
 WHERE followupactions.request_id = followuprequests.id
 	AND followupactions.actor = canvassers.id
 ;
@@ -671,7 +674,7 @@ GRANT SELECT ON lv_followupmethods TO admin,
 --	lists, et cetera 
 ------------------------------------------------------------------------
 CREATE VIEW lv_followuprequests AS
-SELECT electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| genders.id AS elector_id_expanded,
+SELECT electors.name AS elector_id_expanded,
 	followuprequests.elector_id,
 	addresses.address ||', '|| addresses.postcode ||', '|| visits.date AS visit_id_expanded,
 	followuprequests.visit_id,
@@ -680,7 +683,7 @@ SELECT electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| ge
 	followupmethods.id AS method_id_expanded,
 	followuprequests.method_id,
 	followuprequests.id
-FROM followuprequests, visits, addresses, genders, issues, electors, followupmethods
+FROM followuprequests, visits, addresses, issues, electors, followupmethods
 WHERE followuprequests.elector_id = electors.id
 	AND followuprequests.visit_id = visits.id
 	AND followuprequests.issue_id = issues.id
@@ -714,13 +717,13 @@ GRANT SELECT ON lv_genders TO admin,
 CREATE VIEW lv_intentions AS
 SELECT addresses.address ||', '|| addresses.postcode ||', '|| visits.date AS visit_id_expanded,
 	intentions.visit_id,
-	electors.name ||', '|| electors.phone ||', '|| electors.email ||', '|| genders.id AS elector_id_expanded,
+	electors.name AS elector_id_expanded,
 	intentions.elector_id,
 	options.id AS option_id_expanded,
 	intentions.option_id,
 	intentions.locality,
 	intentions.id
-FROM visits, intentions, addresses, genders, electors, options
+FROM visits, intentions, addresses, electors, options
 WHERE intentions.visit_id = visits.id
 	AND intentions.elector_id = electors.id
 	AND intentions.option_id = options.id
diff --git a/resources/templates/auto/application-index.html b/resources/templates/auto/application-index.html
index 4f7b672..cc4b7c6 100644
--- a/resources/templates/auto/application-index.html
+++ b/resources/templates/auto/application-index.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File application-index.html generated 2018-07-09T20:55:34.526Z by adl.to-selmer-templates.
+<!-- File application-index.html generated 2018-07-10T15:25:24.202Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -142,6 +142,9 @@ Followupmethod
 {% endifmemberof %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <dd>
+<p>
+Methods which may be used to follow up a followup request. Reference data.
+</p>
 </dd>
 {% endifmemberof %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -246,14 +249,14 @@ Team
 <dd>
 </dd>
 {% endifmemberof %}
-{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers %}
+{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
 <dt>
 <a href='{{servlet-context}}/list-visits-Visits'>
 Visit
 </a>
 </dt>
 {% endifmemberof %}
-{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers %}
+{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
 <dd>
 <p>
 All visits made by canvassers to dwellings in
diff --git a/resources/templates/auto/form-addresses-Address.html b/resources/templates/auto/form-addresses-Address.html
index 34336c2..47c154a 100644
--- a/resources/templates/auto/form-addresses-Address.html
+++ b/resources/templates/auto/form-addresses-Address.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
-<!-- File form-addresses-Address.html generated 2018-07-09T20:55:34.515Z by adl.to-selmer-templates.
+<!-- File form-addresses-Address.html generated 2018-07-10T15:25:24.196Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
 
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -119,13 +121,9 @@ District_id
 </label>
 {% if {{record.district_id}} %}
 {% ifmemberof admin %}
-<span class='select-box' farside='districts' found='true'>
-<input name='district_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-districts?name=" + district_id_search_box.text, null, function (data) {updateMenuOptions("district_id", "id", ["name"], data);})'/>
-<br/>
 <select id='district_id' name='district_id'>
-{% for r in districts %}<option value='{{r.id}}' {% ifequal record.district_id r.id%}selected{% endifequal %}>{{r.name}}</option>{% endfor %}
+{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='district_id' name='district_id' class='pseudo-widget disabled'>
@@ -139,13 +137,9 @@ You are not permitted to view district_id of addresses
 {% endifmemberof %}
 {% else %}
 {% ifmemberof admin %}
-<span class='select-box' farside='districts' found='true'>
-<input name='district_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-districts?name=" + district_id_search_box.text, null, function (data) {updateMenuOptions("district_id", "id", ["name"], data);})'/>
-<br/>
 <select id='district_id' name='district_id'>
-{% for r in districts %}<option value='{{r.id}}' {% ifequal record.district_id r.id%}selected{% endifequal %}>{{r.name}}</option>{% endfor %}
+{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='district_id' name='district_id' class='pseudo-widget disabled'>
@@ -249,20 +243,34 @@ To delete this addresses record
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `district_id`.
+ */
+$('#district_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
 
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
 
 </script>
 
diff --git a/resources/templates/auto/form-authorities-Authority.html b/resources/templates/auto/form-authorities-Authority.html
index 5e537e5..ae00757 100644
--- a/resources/templates/auto/form-authorities-Authority.html
+++ b/resources/templates/auto/form-authorities-Authority.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-authorities-Authority.html generated 2018-07-09T20:55:34.531Z by adl.to-selmer-templates.
+<!-- File form-authorities-Authority.html generated 2018-07-10T15:25:24.207Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/form-canvassers-Canvasser.html b/resources/templates/auto/form-canvassers-Canvasser.html
index e8d85ff..67341bb 100644
--- a/resources/templates/auto/form-canvassers-Canvasser.html
+++ b/resources/templates/auto/form-canvassers-Canvasser.html
@@ -1,11 +1,14 @@
 {% extends "base.html" %}
-<!-- File form-canvassers-Canvasser.html generated 2018-07-09T20:55:34.536Z by adl.to-selmer-templates.
+<!-- File form-canvassers-Canvasser.html generated 2018-07-10T15:25:24.210Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
-{% script "js/lib/node_modules/simplemde/dist/simplemde.min.js" %}
-     {% style "js/lib/node_modules/simplemde/dist/simplemde.min.css" %}
+
+           {% script "js/lib/node_modules/simplemde/dist/simplemde.min.js" %}
+           {% style "js/lib/node_modules/simplemde/dist/simplemde.min.css" %}
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -81,18 +84,86 @@ You are not permitted to view fullname of canvassers
 {% endif %}
 </p>
 <p class='widget'>
+<label for='avatar'>
+Avatar
+</label>
+{% if {{record.avatar}} %}
+{% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
+<input id='avatar' name='avatar' type='file' value='{{record.avatar}}' maxlength='' size='16'/>
+{% else %}
+{% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
+<span id='avatar' name='avatar' class='pseudo-widget disabled'>
+{{record.avatar}}
+</span>
+{% else %}
+<span id='avatar' name='avatar' class='pseudo-widget not-authorised'>
+You are not permitted to view avatar of canvassers
+</span>
+{% endifmemberof %}
+{% endifmemberof %}
+{% else %}
+{% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
+<input id='avatar' name='avatar' type='file' value='{{record.avatar}}' maxlength='' size='16'/>
+{% else %}
+{% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
+<span id='avatar' name='avatar' class='pseudo-widget disabled'>
+{{record.avatar}}
+</span>
+{% else %}
+<span id='avatar' name='avatar' class='pseudo-widget not-authorised'>
+You are not permitted to view avatar of canvassers
+</span>
+{% endifmemberof %}
+{% endifmemberof %}
+{% endif %}
+</p>
+<p class='widget'>
+<label for='bio'>
+Bio
+</label>
+{% if {{record.bio}} %}
+{% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
+<textarea rows='8' cols='60' id='bio' name='bio'>
+{{record.bio}}
+</textarea>
+{% else %}
+{% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
+<span id='bio' name='bio' class='pseudo-widget disabled'>
+{{record.bio}}
+</span>
+{% else %}
+<span id='bio' name='bio' class='pseudo-widget not-authorised'>
+You are not permitted to view bio of canvassers
+</span>
+{% endifmemberof %}
+{% endifmemberof %}
+{% else %}
+{% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
+<textarea rows='8' cols='60' id='bio' name='bio'>
+{{record.bio}}
+</textarea>
+{% else %}
+{% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
+<span id='bio' name='bio' class='pseudo-widget disabled'>
+{{record.bio}}
+</span>
+{% else %}
+<span id='bio' name='bio' class='pseudo-widget not-authorised'>
+You are not permitted to view bio of canvassers
+</span>
+{% endifmemberof %}
+{% endifmemberof %}
+{% endif %}
+</p>
+<p class='widget'>
 <label for='elector_id'>
 Elector_id
 </label>
 {% if {{record.elector_id}} %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<span class='select-box' farside='electors' found='true'>
-<input name='elector_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-electors?gender=" + elector_id_search_box.text + "&amp;email=" + elector_id_search_box.text + "&amp;name=" + elector_id_search_box.text + "&amp;phone=" + elector_id_search_box.text, null, function (data) {updateMenuOptions("elector_id", "id", ["gender", "email", "name", "phone"], data);})'/>
-<br/>
 <select id='elector_id' name='elector_id'>
-{% for r in electors %}<option value='{{r.id}}' {% ifequal record.elector_id r.id%}selected{% endifequal %}>{{r.name}} {{r.phone}} {{r.email}} {{r.gender}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='elector_id' name='elector_id' class='pseudo-widget disabled'>
@@ -106,13 +177,9 @@ You are not permitted to view elector_id of canvassers
 {% endifmemberof %}
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<span class='select-box' farside='electors' found='true'>
-<input name='elector_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-electors?gender=" + elector_id_search_box.text + "&amp;email=" + elector_id_search_box.text + "&amp;name=" + elector_id_search_box.text + "&amp;phone=" + elector_id_search_box.text, null, function (data) {updateMenuOptions("elector_id", "id", ["gender", "email", "name", "phone"], data);})'/>
-<br/>
 <select id='elector_id' name='elector_id'>
-{% for r in electors %}<option value='{{r.id}}' {% ifequal record.elector_id r.id%}selected{% endifequal %}>{{r.name}} {{r.phone}} {{r.email}} {{r.gender}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='elector_id' name='elector_id' class='pseudo-widget disabled'>
@@ -132,13 +199,9 @@ Address_id
 </label>
 {% if {{record.address_id}} %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<span class='select-box' farside='addresses' found='true'>
-<input name='address_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-addresses?postcode=" + address_id_search_box.text + "&amp;address=" + address_id_search_box.text, null, function (data) {updateMenuOptions("address_id", "id", ["postcode", "address"], data);})'/>
-<br/>
 <select id='address_id' name='address_id'>
-{% for r in addresses %}<option value='{{r.id}}' {% ifequal record.address_id r.id%}selected{% endifequal %}>{{r.address}} {{r.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='address_id' name='address_id' class='pseudo-widget disabled'>
@@ -152,13 +215,9 @@ You are not permitted to view address_id of canvassers
 {% endifmemberof %}
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<span class='select-box' farside='addresses' found='true'>
-<input name='address_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-addresses?postcode=" + address_id_search_box.text + "&amp;address=" + address_id_search_box.text, null, function (data) {updateMenuOptions("address_id", "id", ["postcode", "address"], data);})'/>
-<br/>
 <select id='address_id' name='address_id'>
-{% for r in addresses %}<option value='{{r.id}}' {% ifequal record.address_id r.id%}selected{% endifequal %}>{{r.address}} {{r.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='address_id' name='address_id' class='pseudo-widget disabled'>
@@ -246,13 +305,9 @@ Authority_id
 </label>
 {% if {{record.authority_id}} %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<span class='select-box' farside='authorities' found='true'>
-<input name='authority_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-authorities?id=" + authority_id_search_box.text, null, function (data) {updateMenuOptions("authority_id", "id", ["id"], data);})'/>
-<br/>
 <select id='authority_id' name='authority_id'>
-{% for r in authorities %}<option value='{{r.id}}' {% ifequal record.authority_id r.id%}selected{% endifequal %}>{{r.id}}</option>{% endfor %}
+{% for option in authority_id %}<option value='{{option.id}}' {% ifequal record.authority_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='authority_id' name='authority_id' class='pseudo-widget disabled'>
@@ -266,13 +321,9 @@ You are not permitted to view authority_id of canvassers
 {% endifmemberof %}
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<span class='select-box' farside='authorities' found='true'>
-<input name='authority_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-authorities?id=" + authority_id_search_box.text, null, function (data) {updateMenuOptions("authority_id", "id", ["id"], data);})'/>
-<br/>
 <select id='authority_id' name='authority_id'>
-{% for r in authorities %}<option value='{{r.id}}' {% ifequal record.authority_id r.id%}selected{% endifequal %}>{{r.id}}</option>{% endfor %}
+{% for option in authority_id %}<option value='{{option.id}}' {% ifequal record.authority_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='authority_id' name='authority_id' class='pseudo-widget disabled'>
@@ -326,11 +377,9 @@ Roles
 </label>
 {% if {{record.roles}} %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<span class='select-box' farside='roles' found='true'>
 <select id='roles' name='roles' multiple='multiple'>
-{% for r in roles %}<option value='{{r.role_id}}' {% ifequal record.roles r.role_id%}selected{% endifequal %}>{{r.name}}</option>{% endfor %}
+{% for option in roles %}<option value='{{option.role_id}}' {% ifequal record.roles option.role_id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='roles' name='roles' class='pseudo-widget disabled'>
@@ -344,11 +393,9 @@ You are not permitted to view roles of canvassers
 {% endifmemberof %}
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<span class='select-box' farside='roles' found='true'>
 <select id='roles' name='roles' multiple='multiple'>
-{% for r in roles %}<option value='{{r.role_id}}' {% ifequal record.roles r.role_id%}selected{% endifequal %}>{{r.name}}</option>{% endfor %}
+{% for option in roles %}<option value='{{option.role_id}}' {% ifequal record.roles option.role_id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='roles' name='roles' class='pseudo-widget disabled'>
@@ -384,20 +431,63 @@ To delete this canvassers record
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `elector_id`.
+ */
+$('#elector_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
 
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
+
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `address_id`.
+ */
+$('#address_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
+
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
 
           var simplemde = new SimpleMDE({
             autosave: {
diff --git a/resources/templates/auto/form-districts-District.html b/resources/templates/auto/form-districts-District.html
index d9f1549..816fcfc 100644
--- a/resources/templates/auto/form-districts-District.html
+++ b/resources/templates/auto/form-districts-District.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-districts-District.html generated 2018-07-09T20:55:34.509Z by adl.to-selmer-templates.
+<!-- File form-districts-District.html generated 2018-07-10T15:25:24.193Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/form-dwellings-Dwelling.html b/resources/templates/auto/form-dwellings-Dwelling.html
index bb1f2cd..d06a363 100644
--- a/resources/templates/auto/form-dwellings-Dwelling.html
+++ b/resources/templates/auto/form-dwellings-Dwelling.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
-<!-- File form-dwellings-Dwelling.html generated 2018-07-09T20:55:34.547Z by adl.to-selmer-templates.
+<!-- File form-dwellings-Dwelling.html generated 2018-07-10T15:25:24.216Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
 
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -17,13 +19,9 @@ Address_id
 </label>
 {% if {{record.address_id}} %}
 {% ifmemberof admin %}
-<span class='select-box' farside='addresses' found='true'>
-<input name='address_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-addresses?postcode=" + address_id_search_box.text + "&amp;address=" + address_id_search_box.text, null, function (data) {updateMenuOptions("address_id", "id", ["postcode", "address"], data);})'/>
-<br/>
 <select id='address_id' name='address_id'>
-{% for r in addresses %}<option value='{{r.id}}' {% ifequal record.address_id r.id%}selected{% endifequal %}>{{r.address}} {{r.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='address_id' name='address_id' class='pseudo-widget disabled'>
@@ -37,13 +35,9 @@ You are not permitted to view address_id of dwellings
 {% endifmemberof %}
 {% else %}
 {% ifmemberof admin %}
-<span class='select-box' farside='addresses' found='true'>
-<input name='address_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-addresses?postcode=" + address_id_search_box.text + "&amp;address=" + address_id_search_box.text, null, function (data) {updateMenuOptions("address_id", "id", ["postcode", "address"], data);})'/>
-<br/>
 <select id='address_id' name='address_id'>
-{% for r in addresses %}<option value='{{r.id}}' {% ifequal record.address_id r.id%}selected{% endifequal %}>{{r.address}} {{r.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='address_id' name='address_id' class='pseudo-widget disabled'>
@@ -113,20 +107,34 @@ To delete this dwellings record
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `address_id`.
+ */
+$('#address_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
 
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
 
 </script>
 
diff --git a/resources/templates/auto/form-electors-Elector.html b/resources/templates/auto/form-electors-Elector.html
index 33a6f7d..2a566f1 100644
--- a/resources/templates/auto/form-electors-Elector.html
+++ b/resources/templates/auto/form-electors-Elector.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
-<!-- File form-electors-Elector.html generated 2018-07-09T20:55:34.529Z by adl.to-selmer-templates.
+<!-- File form-electors-Elector.html generated 2018-07-10T15:25:24.205Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
 
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -51,13 +53,9 @@ Dwelling_id
 </label>
 {% if {{record.dwelling_id}} %}
 {% ifmemberof admin %}
-<span class='select-box' farside='dwellings' found='true'>
-<input name='dwelling_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-dwellings?sub-address=" + dwelling_id_search_box.text + "&amp;address_id=" + dwelling_id_search_box.text, null, function (data) {updateMenuOptions("dwelling_id", "id", ["sub-address", "address_id"], data);})'/>
-<br/>
 <select id='dwelling_id' name='dwelling_id'>
-{% for r in dwellings %}<option value='{{r.id}}' {% ifequal record.dwelling_id r.id%}selected{% endifequal %}>{{r.address_id}} {{r.sub-address}}</option>{% endfor %}
+{% for option in dwelling_id %}<option value='{{option.id}}' {% ifequal record.dwelling_id option.id%}selected{% endifequal %}>{{option.address_id}} {{option.sub-address}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='dwelling_id' name='dwelling_id' class='pseudo-widget disabled'>
@@ -71,13 +69,9 @@ You are not permitted to view dwelling_id of electors
 {% endifmemberof %}
 {% else %}
 {% ifmemberof admin %}
-<span class='select-box' farside='dwellings' found='true'>
-<input name='dwelling_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-dwellings?sub-address=" + dwelling_id_search_box.text + "&amp;address_id=" + dwelling_id_search_box.text, null, function (data) {updateMenuOptions("dwelling_id", "id", ["sub-address", "address_id"], data);})'/>
-<br/>
 <select id='dwelling_id' name='dwelling_id'>
-{% for r in dwellings %}<option value='{{r.id}}' {% ifequal record.dwelling_id r.id%}selected{% endifequal %}>{{r.address_id}} {{r.sub-address}}</option>{% endfor %}
+{% for option in dwelling_id %}<option value='{{option.id}}' {% ifequal record.dwelling_id option.id%}selected{% endifequal %}>{{option.address_id}} {{option.sub-address}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='dwelling_id' name='dwelling_id' class='pseudo-widget disabled'>
@@ -165,11 +159,9 @@ Gender
 </label>
 {% if {{record.gender}} %}
 {% ifmemberof admin %}
-<span class='select-box' farside='genders' found='true'>
 <select id='gender' name='gender'>
-{% for r in genders %}<option value='{{r.id}}' {% ifequal record.gender r.id%}selected{% endifequal %}>{{r.id}}</option>{% endfor %}
+{% for option in gender %}<option value='{{option.id}}' {% ifequal record.gender option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='gender' name='gender' class='pseudo-widget disabled'>
@@ -183,11 +175,9 @@ You are not permitted to view gender of electors
 {% endifmemberof %}
 {% else %}
 {% ifmemberof admin %}
-<span class='select-box' farside='genders' found='true'>
 <select id='gender' name='gender'>
-{% for r in genders %}<option value='{{r.id}}' {% ifequal record.gender r.id%}selected{% endifequal %}>{{r.id}}</option>{% endfor %}
+{% for option in gender %}<option value='{{option.id}}' {% ifequal record.gender option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='gender' name='gender' class='pseudo-widget disabled'>
@@ -223,20 +213,34 @@ To delete this electors record
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `dwelling_id`.
+ */
+$('#dwelling_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
 
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
 
 </script>
 
diff --git a/resources/templates/auto/form-events-Events.html b/resources/templates/auto/form-events-Events.html
index 186b51d..8238f02 100644
--- a/resources/templates/auto/form-events-Events.html
+++ b/resources/templates/auto/form-events-Events.html
@@ -1,11 +1,14 @@
 {% extends "base.html" %}
-<!-- File form-events-Events.html generated 2018-07-09T20:55:34.534Z by adl.to-selmer-templates.
+<!-- File form-events-Events.html generated 2018-07-10T15:25:24.209Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
-{% script "js/lib/node_modules/simplemde/dist/simplemde.min.js" %}
-     {% style "js/lib/node_modules/simplemde/dist/simplemde.min.css" %}
+
+           {% script "js/lib/node_modules/simplemde/dist/simplemde.min.js" %}
+           {% style "js/lib/node_modules/simplemde/dist/simplemde.min.css" %}
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -52,13 +55,9 @@ Teams
 </label>
 {% if {{record.teams}} %}
 {% ifmemberof teamorganisers admin %}
-<span class='select-box' farside='teams' found='true'>
-<input name='teams_search_box' onchange='$.getJSON("/auto/json/seach-strings-teams?name=" + teams_search_box.text, null, function (data) {updateMenuOptions("teams", "id", ["name"], data);})'/>
-<br/>
 <select id='teams' name='teams' multiple='multiple'>
-{% for r in teams %}<option value='{{r.id}}' {% ifequal record.teams r.id%}selected{% endifequal %}>{{r.name}}</option>{% endfor %}
+{% for option in teams %}<option value='{{option.id}}' {% ifequal record.teams option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='teams' name='teams' class='pseudo-widget disabled'>
@@ -72,13 +71,9 @@ You are not permitted to view teams of events
 {% endifmemberof %}
 {% else %}
 {% ifmemberof teamorganisers admin %}
-<span class='select-box' farside='teams' found='true'>
-<input name='teams_search_box' onchange='$.getJSON("/auto/json/seach-strings-teams?name=" + teams_search_box.text, null, function (data) {updateMenuOptions("teams", "id", ["name"], data);})'/>
-<br/>
 <select id='teams' name='teams' multiple='multiple'>
-{% for r in teams %}<option value='{{r.id}}' {% ifequal record.teams r.id%}selected{% endifequal %}>{{r.name}}</option>{% endfor %}
+{% for option in teams %}<option value='{{option.id}}' {% ifequal record.teams option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='teams' name='teams' class='pseudo-widget disabled'>
@@ -254,21 +249,6 @@ To delete this events record
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
-
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
-
           var simplemde = new SimpleMDE({
             autosave: {
               enabled: true,
diff --git a/resources/templates/auto/form-followupactions-Followupaction.html b/resources/templates/auto/form-followupactions-Followupaction.html
index 0da845b..f65af24 100644
--- a/resources/templates/auto/form-followupactions-Followupaction.html
+++ b/resources/templates/auto/form-followupactions-Followupaction.html
@@ -1,11 +1,14 @@
 {% extends "base.html" %}
-<!-- File form-followupactions-Followupaction.html generated 2018-07-09T20:55:34.549Z by adl.to-selmer-templates.
+<!-- File form-followupactions-Followupaction.html generated 2018-07-10T15:25:24.218Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
-{% script "js/lib/node_modules/simplemde/dist/simplemde.min.js" %}
-     {% style "js/lib/node_modules/simplemde/dist/simplemde.min.css" %}
+
+           {% script "js/lib/node_modules/simplemde/dist/simplemde.min.js" %}
+           {% style "js/lib/node_modules/simplemde/dist/simplemde.min.css" %}
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -18,13 +21,9 @@ Request_id
 </label>
 {% if {{record.request_id}} %}
 {% ifmemberof admin %}
-<span class='select-box' farside='followuprequests' found='true'>
-<input name='request_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-followuprequests?elector_id=" + request_id_search_box.text + "&amp;issue_id=" + request_id_search_box.text + "&amp;visit_id=" + request_id_search_box.text, null, function (data) {updateMenuOptions("request_id", "id", ["elector_id", "issue_id", "visit_id"], data);})'/>
-<br/>
 <select id='request_id' name='request_id'>
-{% for r in followuprequests %}<option value='{{r.id}}' {% ifequal record.request_id r.id%}selected{% endifequal %}>{{r.elector_id}} {{r.visit_id}} {{r.issue_id}}</option>{% endfor %}
+{% for option in request_id %}<option value='{{option.id}}' {% ifequal record.request_id option.id%}selected{% endifequal %}>{{option.elector_id}} {{option.visit_id}} {{option.issue_id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
 <span id='request_id' name='request_id' class='pseudo-widget disabled'>
@@ -38,13 +37,9 @@ You are not permitted to view request_id of followupactions
 {% endifmemberof %}
 {% else %}
 {% ifmemberof admin %}
-<span class='select-box' farside='followuprequests' found='true'>
-<input name='request_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-followuprequests?elector_id=" + request_id_search_box.text + "&amp;issue_id=" + request_id_search_box.text + "&amp;visit_id=" + request_id_search_box.text, null, function (data) {updateMenuOptions("request_id", "id", ["elector_id", "issue_id", "visit_id"], data);})'/>
-<br/>
 <select id='request_id' name='request_id'>
-{% for r in followuprequests %}<option value='{{r.id}}' {% ifequal record.request_id r.id%}selected{% endifequal %}>{{r.elector_id}} {{r.visit_id}} {{r.issue_id}}</option>{% endfor %}
+{% for option in request_id %}<option value='{{option.id}}' {% ifequal record.request_id option.id%}selected{% endifequal %}>{{option.elector_id}} {{option.visit_id}} {{option.issue_id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
 <span id='request_id' name='request_id' class='pseudo-widget disabled'>
@@ -64,13 +59,9 @@ Actor
 </label>
 {% if {{record.actor}} %}
 {% ifmemberof admin %}
-<span class='select-box' farside='canvassers' found='true'>
-<input name='actor_search_box' onchange='$.getJSON("/auto/json/seach-strings-canvassers?=" + actor_search_box.text, null, function (data) {updateMenuOptions("actor", "", [""], data);})'/>
-<br/>
 <select id='actor' name='actor'>
-{% for r in canvassers %}<option value='{{r.id}}' {% ifequal record.actor r.id%}selected{% endifequal %}>{{r.username}} {{r.fullname}} {{r.address_id}} {{r.phone}} {{r.email}}</option>{% endfor %}
+{% for option in actor %}<option value='{{option.id}}' {% ifequal record.actor option.id%}selected{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
 <span id='actor' name='actor' class='pseudo-widget disabled'>
@@ -84,13 +75,9 @@ You are not permitted to view actor of followupactions
 {% endifmemberof %}
 {% else %}
 {% ifmemberof admin %}
-<span class='select-box' farside='canvassers' found='true'>
-<input name='actor_search_box' onchange='$.getJSON("/auto/json/seach-strings-canvassers?=" + actor_search_box.text, null, function (data) {updateMenuOptions("actor", "", [""], data);})'/>
-<br/>
 <select id='actor' name='actor'>
-{% for r in canvassers %}<option value='{{r.id}}' {% ifequal record.actor r.id%}selected{% endifequal %}>{{r.username}} {{r.fullname}} {{r.address_id}} {{r.phone}} {{r.email}}</option>{% endfor %}
+{% for option in actor %}<option value='{{option.id}}' {% ifequal record.actor option.id%}selected{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
 <span id='actor' name='actor' class='pseudo-widget disabled'>
@@ -232,20 +219,63 @@ To delete this followupactions record
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `request_id`.
+ */
+$('#request_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
 
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
+
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `actor`.
+ */
+$('#actor').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
+
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
 
           var simplemde = new SimpleMDE({
             autosave: {
diff --git a/resources/templates/auto/form-followupmethods-Followupmethod.html b/resources/templates/auto/form-followupmethods-Followupmethod.html
index 95cb462..a0087da 100644
--- a/resources/templates/auto/form-followupmethods-Followupmethod.html
+++ b/resources/templates/auto/form-followupmethods-Followupmethod.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-followupmethods-Followupmethod.html generated 2018-07-09T20:55:34.550Z by adl.to-selmer-templates.
+<!-- File form-followupmethods-Followupmethod.html generated 2018-07-10T15:25:24.219Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/form-followuprequests-Followuprequest.html b/resources/templates/auto/form-followuprequests-Followuprequest.html
index 3498ba8..2229a47 100644
--- a/resources/templates/auto/form-followuprequests-Followuprequest.html
+++ b/resources/templates/auto/form-followuprequests-Followuprequest.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
-<!-- File form-followuprequests-Followuprequest.html generated 2018-07-09T20:55:34.512Z by adl.to-selmer-templates.
+<!-- File form-followuprequests-Followuprequest.html generated 2018-07-10T15:25:24.194Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
 
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -16,14 +18,10 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 Elector_id
 </label>
 {% if {{record.elector_id}} %}
-{% ifmemberof admin %}
-<span class='select-box' farside='electors' found='true'>
-<input name='elector_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-electors?gender=" + elector_id_search_box.text + "&amp;email=" + elector_id_search_box.text + "&amp;name=" + elector_id_search_box.text + "&amp;phone=" + elector_id_search_box.text, null, function (data) {updateMenuOptions("elector_id", "id", ["gender", "email", "name", "phone"], data);})'/>
-<br/>
+{% ifmemberof %}
 <select id='elector_id' name='elector_id'>
-{% for r in electors %}<option value='{{r.id}}' {% ifequal record.elector_id r.id%}selected{% endifequal %}>{{r.name}} {{r.phone}} {{r.email}} {{r.gender}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='elector_id' name='elector_id' class='pseudo-widget disabled'>
@@ -36,14 +34,10 @@ You are not permitted to view elector_id of followuprequests
 {% endifmemberof %}
 {% endifmemberof %}
 {% else %}
-{% ifmemberof admin %}
-<span class='select-box' farside='electors' found='true'>
-<input name='elector_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-electors?gender=" + elector_id_search_box.text + "&amp;email=" + elector_id_search_box.text + "&amp;name=" + elector_id_search_box.text + "&amp;phone=" + elector_id_search_box.text, null, function (data) {updateMenuOptions("elector_id", "id", ["gender", "email", "name", "phone"], data);})'/>
-<br/>
+{% ifmemberof %}
 <select id='elector_id' name='elector_id'>
-{% for r in electors %}<option value='{{r.id}}' {% ifequal record.elector_id r.id%}selected{% endifequal %}>{{r.name}} {{r.phone}} {{r.email}} {{r.gender}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='elector_id' name='elector_id' class='pseudo-widget disabled'>
@@ -62,14 +56,10 @@ You are not permitted to view elector_id of followuprequests
 Visit_id
 </label>
 {% if {{record.visit_id}} %}
-{% ifmemberof admin %}
-<span class='select-box' farside='visits' found='true'>
-<input name='visit_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-visits?address_id=" + visit_id_search_box.text + "&amp;date=" + visit_id_search_box.text, null, function (data) {updateMenuOptions("visit_id", "id", ["address_id", "date"], data);})'/>
-<br/>
+{% ifmemberof %}
 <select id='visit_id' name='visit_id'>
-{% for r in visits %}<option value='{{r.id}}' {% ifequal record.visit_id r.id%}selected{% endifequal %}>{{r.address_id}} {{r.date}}</option>{% endfor %}
+{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected{% endifequal %}>{{option.address_id}} {{option.date}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='visit_id' name='visit_id' class='pseudo-widget disabled'>
@@ -82,14 +72,10 @@ You are not permitted to view visit_id of followuprequests
 {% endifmemberof %}
 {% endifmemberof %}
 {% else %}
-{% ifmemberof admin %}
-<span class='select-box' farside='visits' found='true'>
-<input name='visit_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-visits?address_id=" + visit_id_search_box.text + "&amp;date=" + visit_id_search_box.text, null, function (data) {updateMenuOptions("visit_id", "id", ["address_id", "date"], data);})'/>
-<br/>
+{% ifmemberof %}
 <select id='visit_id' name='visit_id'>
-{% for r in visits %}<option value='{{r.id}}' {% ifequal record.visit_id r.id%}selected{% endifequal %}>{{r.address_id}} {{r.date}}</option>{% endfor %}
+{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected{% endifequal %}>{{option.address_id}} {{option.date}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='visit_id' name='visit_id' class='pseudo-widget disabled'>
@@ -108,12 +94,10 @@ You are not permitted to view visit_id of followuprequests
 Issue_id
 </label>
 {% if {{record.issue_id}} %}
-{% ifmemberof admin %}
-<span class='select-box' farside='issues' found='true'>
+{% ifmemberof %}
 <select id='issue_id' name='issue_id'>
-{% for r in issues %}<option value='{{r.id}}' {% ifequal record.issue_id r.id%}selected{% endifequal %}>{{r.id}}</option>{% endfor %}
+{% for option in issue_id %}<option value='{{option.id}}' {% ifequal record.issue_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='issue_id' name='issue_id' class='pseudo-widget disabled'>
@@ -126,12 +110,10 @@ You are not permitted to view issue_id of followuprequests
 {% endifmemberof %}
 {% endifmemberof %}
 {% else %}
-{% ifmemberof admin %}
-<span class='select-box' farside='issues' found='true'>
+{% ifmemberof %}
 <select id='issue_id' name='issue_id'>
-{% for r in issues %}<option value='{{r.id}}' {% ifequal record.issue_id r.id%}selected{% endifequal %}>{{r.id}}</option>{% endfor %}
+{% for option in issue_id %}<option value='{{option.id}}' {% ifequal record.issue_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='issue_id' name='issue_id' class='pseudo-widget disabled'>
@@ -150,12 +132,10 @@ You are not permitted to view issue_id of followuprequests
 Method_id
 </label>
 {% if {{record.method_id}} %}
-{% ifmemberof admin %}
-<span class='select-box' farside='followupmethods' found='true'>
+{% ifmemberof %}
 <select id='method_id' name='method_id'>
-{% for r in followupmethods %}<option value='{{r.id}}' {% ifequal record.method_id r.id%}selected{% endifequal %}>{{r.id}}</option>{% endfor %}
+{% for option in method_id %}<option value='{{option.id}}' {% ifequal record.method_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='method_id' name='method_id' class='pseudo-widget disabled'>
@@ -168,12 +148,10 @@ You are not permitted to view method_id of followuprequests
 {% endifmemberof %}
 {% endifmemberof %}
 {% else %}
-{% ifmemberof admin %}
-<span class='select-box' farside='followupmethods' found='true'>
+{% ifmemberof %}
 <select id='method_id' name='method_id'>
-{% for r in followupmethods %}<option value='{{r.id}}' {% ifequal record.method_id r.id%}selected{% endifequal %}>{{r.id}}</option>{% endfor %}
+{% for option in method_id %}<option value='{{option.id}}' {% ifequal record.method_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='method_id' name='method_id' class='pseudo-widget disabled'>
@@ -187,7 +165,7 @@ You are not permitted to view method_id of followuprequests
 {% endifmemberof %}
 {% endif %}
 </p>
-{% ifmemberof admin %}
+{% ifmemberof %}
 <p class='widget action-safe'>
 <label for='save-button' class='action-safe'>
 To save this followuprequests record
@@ -195,7 +173,7 @@ To save this followuprequests record
 <input id='save-button' name='save-button' class='action-safe' type='submit' value='Save!'/>
 </p>
 {% endifmemberof %}
-{% ifmemberof admin %}
+{% ifmemberof %}
 <p class='widget action-dangerous'>
 <label for='delete-button' class='action-dangerous'>
 To delete this followuprequests record
@@ -209,20 +187,63 @@ To delete this followuprequests record
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `elector_id`.
+ */
+$('#elector_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
 
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
+
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `visit_id`.
+ */
+$('#visit_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
+
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
 
 </script>
 
diff --git a/resources/templates/auto/form-genders-Gender.html b/resources/templates/auto/form-genders-Gender.html
index 54b3900..0a0398b 100644
--- a/resources/templates/auto/form-genders-Gender.html
+++ b/resources/templates/auto/form-genders-Gender.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-genders-Gender.html generated 2018-07-09T20:55:34.505Z by adl.to-selmer-templates.
+<!-- File form-genders-Gender.html generated 2018-07-10T15:25:24.191Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/form-intentions-Intention.html b/resources/templates/auto/form-intentions-Intention.html
index a9a93e8..421e196 100644
--- a/resources/templates/auto/form-intentions-Intention.html
+++ b/resources/templates/auto/form-intentions-Intention.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
-<!-- File form-intentions-Intention.html generated 2018-07-09T20:55:34.543Z by adl.to-selmer-templates.
+<!-- File form-intentions-Intention.html generated 2018-07-10T15:25:24.214Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
 
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -15,14 +17,10 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 Visit_id
 </label>
 {% if {{record.visit_id}} %}
-{% ifmemberof admin %}
-<span class='select-box' farside='visits' found='true'>
-<input name='visit_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-visits?address_id=" + visit_id_search_box.text + "&amp;date=" + visit_id_search_box.text, null, function (data) {updateMenuOptions("visit_id", "id", ["address_id", "date"], data);})'/>
-<br/>
+{% ifmemberof %}
 <select id='visit_id' name='visit_id'>
-{% for r in visits %}<option value='{{r.id}}' {% ifequal record.visit_id r.id%}selected{% endifequal %}>{{r.address_id}} {{r.date}}</option>{% endfor %}
+{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected{% endifequal %}>{{option.address_id}} {{option.date}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
 <span id='visit_id' name='visit_id' class='pseudo-widget disabled'>
@@ -35,14 +33,10 @@ You are not permitted to view visit_id of intentions
 {% endifmemberof %}
 {% endifmemberof %}
 {% else %}
-{% ifmemberof admin %}
-<span class='select-box' farside='visits' found='true'>
-<input name='visit_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-visits?address_id=" + visit_id_search_box.text + "&amp;date=" + visit_id_search_box.text, null, function (data) {updateMenuOptions("visit_id", "id", ["address_id", "date"], data);})'/>
-<br/>
+{% ifmemberof %}
 <select id='visit_id' name='visit_id'>
-{% for r in visits %}<option value='{{r.id}}' {% ifequal record.visit_id r.id%}selected{% endifequal %}>{{r.address_id}} {{r.date}}</option>{% endfor %}
+{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected{% endifequal %}>{{option.address_id}} {{option.date}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
 <span id='visit_id' name='visit_id' class='pseudo-widget disabled'>
@@ -61,14 +55,10 @@ You are not permitted to view visit_id of intentions
 Elector_id
 </label>
 {% if {{record.elector_id}} %}
-{% ifmemberof admin %}
-<span class='select-box' farside='electors' found='true'>
-<input name='elector_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-electors?gender=" + elector_id_search_box.text + "&amp;email=" + elector_id_search_box.text + "&amp;name=" + elector_id_search_box.text + "&amp;phone=" + elector_id_search_box.text, null, function (data) {updateMenuOptions("elector_id", "id", ["gender", "email", "name", "phone"], data);})'/>
-<br/>
+{% ifmemberof %}
 <select id='elector_id' name='elector_id'>
-{% for r in electors %}<option value='{{r.id}}' {% ifequal record.elector_id r.id%}selected{% endifequal %}>{{r.name}} {{r.phone}} {{r.email}} {{r.gender}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
 <span id='elector_id' name='elector_id' class='pseudo-widget disabled'>
@@ -81,14 +71,10 @@ You are not permitted to view elector_id of intentions
 {% endifmemberof %}
 {% endifmemberof %}
 {% else %}
-{% ifmemberof admin %}
-<span class='select-box' farside='electors' found='true'>
-<input name='elector_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-electors?gender=" + elector_id_search_box.text + "&amp;email=" + elector_id_search_box.text + "&amp;name=" + elector_id_search_box.text + "&amp;phone=" + elector_id_search_box.text, null, function (data) {updateMenuOptions("elector_id", "id", ["gender", "email", "name", "phone"], data);})'/>
-<br/>
+{% ifmemberof %}
 <select id='elector_id' name='elector_id'>
-{% for r in electors %}<option value='{{r.id}}' {% ifequal record.elector_id r.id%}selected{% endifequal %}>{{r.name}} {{r.phone}} {{r.email}} {{r.gender}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
 <span id='elector_id' name='elector_id' class='pseudo-widget disabled'>
@@ -107,12 +93,10 @@ You are not permitted to view elector_id of intentions
 Option_id
 </label>
 {% if {{record.option_id}} %}
-{% ifmemberof admin %}
-<span class='select-box' farside='options' found='true'>
+{% ifmemberof %}
 <select id='option_id' name='option_id'>
-{% for r in options %}<option value='{{r.id}}' {% ifequal record.option_id r.id%}selected{% endifequal %}>{{r.id}}</option>{% endfor %}
+{% for option in option_id %}<option value='{{option.id}}' {% ifequal record.option_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
 <span id='option_id' name='option_id' class='pseudo-widget disabled'>
@@ -125,12 +109,10 @@ You are not permitted to view option_id of intentions
 {% endifmemberof %}
 {% endifmemberof %}
 {% else %}
-{% ifmemberof admin %}
-<span class='select-box' farside='options' found='true'>
+{% ifmemberof %}
 <select id='option_id' name='option_id'>
-{% for r in options %}<option value='{{r.id}}' {% ifequal record.option_id r.id%}selected{% endifequal %}>{{r.id}}</option>{% endfor %}
+{% for option in option_id %}<option value='{{option.id}}' {% ifequal record.option_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
 <span id='option_id' name='option_id' class='pseudo-widget disabled'>
@@ -149,7 +131,7 @@ You are not permitted to view option_id of intentions
 Locality
 </label>
 {% if {{record.locality}} %}
-{% ifmemberof admin %}
+{% ifmemberof %}
 <input id='locality' name='locality' type='number' value='{{record.locality}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
@@ -163,7 +145,7 @@ You are not permitted to view locality of intentions
 {% endifmemberof %}
 {% endifmemberof %}
 {% else %}
-{% ifmemberof admin %}
+{% ifmemberof %}
 <input id='locality' name='locality' type='number' value='{{record.locality}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
@@ -178,7 +160,7 @@ You are not permitted to view locality of intentions
 {% endifmemberof %}
 {% endif %}
 </p>
-{% ifmemberof admin %}
+{% ifmemberof %}
 <p class='widget action-safe'>
 <label for='save-button' class='action-safe'>
 To save this intentions record
@@ -186,7 +168,7 @@ To save this intentions record
 <input id='save-button' name='save-button' class='action-safe' type='submit' value='Save!'/>
 </p>
 {% endifmemberof %}
-{% ifmemberof admin %}
+{% ifmemberof %}
 <p class='widget action-dangerous'>
 <label for='delete-button' class='action-dangerous'>
 To delete this intentions record
@@ -200,20 +182,63 @@ To delete this intentions record
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `visit_id`.
+ */
+$('#visit_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
 
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
+
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `elector_id`.
+ */
+$('#elector_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
+
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
 
 </script>
 
diff --git a/resources/templates/auto/form-issues-Issue.html b/resources/templates/auto/form-issues-Issue.html
index dbd7e03..eed301f 100644
--- a/resources/templates/auto/form-issues-Issue.html
+++ b/resources/templates/auto/form-issues-Issue.html
@@ -1,11 +1,14 @@
 {% extends "base.html" %}
-<!-- File form-issues-Issue.html generated 2018-07-09T20:55:34.521Z by adl.to-selmer-templates.
+<!-- File form-issues-Issue.html generated 2018-07-10T15:25:24.198Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
-{% script "js/lib/node_modules/simplemde/dist/simplemde.min.js" %}
-     {% style "js/lib/node_modules/simplemde/dist/simplemde.min.css" %}
+
+           {% script "js/lib/node_modules/simplemde/dist/simplemde.min.js" %}
+           {% style "js/lib/node_modules/simplemde/dist/simplemde.min.css" %}
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -173,21 +176,6 @@ To delete this issues record
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
-
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
-
           var simplemde = new SimpleMDE({
             autosave: {
               enabled: true,
diff --git a/resources/templates/auto/form-options-Option.html b/resources/templates/auto/form-options-Option.html
index 3b29baf..d6d5a4e 100644
--- a/resources/templates/auto/form-options-Option.html
+++ b/resources/templates/auto/form-options-Option.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-options-Option.html generated 2018-07-09T20:55:34.542Z by adl.to-selmer-templates.
+<!-- File form-options-Option.html generated 2018-07-10T15:25:24.214Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/form-roles-Role.html b/resources/templates/auto/form-roles-Role.html
index dcedb2b..d7c22cd 100644
--- a/resources/templates/auto/form-roles-Role.html
+++ b/resources/templates/auto/form-roles-Role.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
-<!-- File form-roles-Role.html generated 2018-07-09T20:55:34.522Z by adl.to-selmer-templates.
+<!-- File form-roles-Role.html generated 2018-07-10T15:25:24.199Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
 
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -51,13 +53,9 @@ Members
 </label>
 {% if {{record.members}} %}
 {% ifmemberof admin %}
-<span class='select-box' farside='canvassers' found='true'>
-<input name='members_search_box' onchange='$.getJSON("/auto/json/seach-strings-canvassers?=" + members_search_box.text, null, function (data) {updateMenuOptions("members", "", [""], data);})'/>
-<br/>
 <select id='members' name='members' multiple='multiple'>
-{% for r in canvassers %}<option value='{{r.id}}' {% ifequal record.members r.id%}selected{% endifequal %}>{{r.username}} {{r.fullname}} {{r.address_id}} {{r.phone}} {{r.email}}</option>{% endfor %}
+{% for option in members %}<option value='{{option.id}}' {% ifequal record.members option.id%}selected{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='members' name='members' class='pseudo-widget disabled'>
@@ -71,13 +69,9 @@ You are not permitted to view members of roles
 {% endifmemberof %}
 {% else %}
 {% ifmemberof admin %}
-<span class='select-box' farside='canvassers' found='true'>
-<input name='members_search_box' onchange='$.getJSON("/auto/json/seach-strings-canvassers?=" + members_search_box.text, null, function (data) {updateMenuOptions("members", "", [""], data);})'/>
-<br/>
 <select id='members' name='members' multiple='multiple'>
-{% for r in canvassers %}<option value='{{r.id}}' {% ifequal record.members r.id%}selected{% endifequal %}>{{r.username}} {{r.fullname}} {{r.address_id}} {{r.phone}} {{r.email}}</option>{% endfor %}
+{% for option in members %}<option value='{{option.id}}' {% ifequal record.members option.id%}selected{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='members' name='members' class='pseudo-widget disabled'>
@@ -113,21 +107,6 @@ To delete this roles record
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
-
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
-
 </script>
 
 {% endblock %}
diff --git a/resources/templates/auto/form-teams-Team.html b/resources/templates/auto/form-teams-Team.html
index 60f17df..0e61dac 100644
--- a/resources/templates/auto/form-teams-Team.html
+++ b/resources/templates/auto/form-teams-Team.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
-<!-- File form-teams-Team.html generated 2018-07-09T20:55:34.527Z by adl.to-selmer-templates.
+<!-- File form-teams-Team.html generated 2018-07-10T15:25:24.204Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
 
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -51,13 +53,9 @@ District_id
 </label>
 {% if {{record.district_id}} %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
-<span class='select-box' farside='districts' found='true'>
-<input name='district_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-districts?name=" + district_id_search_box.text, null, function (data) {updateMenuOptions("district_id", "id", ["name"], data);})'/>
-<br/>
 <select id='district_id' name='district_id'>
-{% for r in districts %}<option value='{{r.id}}' {% ifequal record.district_id r.id%}selected{% endifequal %}>{{r.name}}</option>{% endfor %}
+{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
 <span id='district_id' name='district_id' class='pseudo-widget disabled'>
@@ -71,13 +69,9 @@ You are not permitted to view district_id of teams
 {% endifmemberof %}
 {% else %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
-<span class='select-box' farside='districts' found='true'>
-<input name='district_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-districts?name=" + district_id_search_box.text, null, function (data) {updateMenuOptions("district_id", "id", ["name"], data);})'/>
-<br/>
 <select id='district_id' name='district_id'>
-{% for r in districts %}<option value='{{r.id}}' {% ifequal record.district_id r.id%}selected{% endifequal %}>{{r.name}}</option>{% endfor %}
+{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
 <span id='district_id' name='district_id' class='pseudo-widget disabled'>
@@ -131,13 +125,9 @@ Members
 </label>
 {% if {{record.members}} %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
-<span class='select-box' farside='canvassers' found='true'>
-<input name='members_search_box' onchange='$.getJSON("/auto/json/seach-strings-canvassers?=" + members_search_box.text, null, function (data) {updateMenuOptions("members", "", [""], data);})'/>
-<br/>
 <select id='members' name='members' multiple='multiple'>
-{% for r in canvassers %}<option value='{{r.id}}' {% ifequal record.members r.id%}selected{% endifequal %}>{{r.username}} {{r.fullname}} {{r.address_id}} {{r.phone}} {{r.email}}</option>{% endfor %}
+{% for option in members %}<option value='{{option.id}}' {% ifequal record.members option.id%}selected{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
 <span id='members' name='members' class='pseudo-widget disabled'>
@@ -151,13 +141,9 @@ You are not permitted to view members of teams
 {% endifmemberof %}
 {% else %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
-<span class='select-box' farside='canvassers' found='true'>
-<input name='members_search_box' onchange='$.getJSON("/auto/json/seach-strings-canvassers?=" + members_search_box.text, null, function (data) {updateMenuOptions("members", "", [""], data);})'/>
-<br/>
 <select id='members' name='members' multiple='multiple'>
-{% for r in canvassers %}<option value='{{r.id}}' {% ifequal record.members r.id%}selected{% endifequal %}>{{r.username}} {{r.fullname}} {{r.address_id}} {{r.phone}} {{r.email}}</option>{% endfor %}
+{% for option in members %}<option value='{{option.id}}' {% ifequal record.members option.id%}selected{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
 <span id='members' name='members' class='pseudo-widget disabled'>
@@ -177,13 +163,9 @@ Organisers
 </label>
 {% if {{record.organisers}} %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
-<span class='select-box' farside='canvassers' found='true'>
-<input name='organisers_search_box' onchange='$.getJSON("/auto/json/seach-strings-canvassers?=" + organisers_search_box.text, null, function (data) {updateMenuOptions("organisers", "", [""], data);})'/>
-<br/>
 <select id='organisers' name='organisers' multiple='multiple'>
-{% for r in canvassers %}<option value='{{r.id}}' {% ifequal record.organisers r.id%}selected{% endifequal %}>{{r.username}} {{r.fullname}} {{r.address_id}} {{r.phone}} {{r.email}}</option>{% endfor %}
+{% for option in organisers %}<option value='{{option.id}}' {% ifequal record.organisers option.id%}selected{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
 <span id='organisers' name='organisers' class='pseudo-widget disabled'>
@@ -197,13 +179,9 @@ You are not permitted to view organisers of teams
 {% endifmemberof %}
 {% else %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
-<span class='select-box' farside='canvassers' found='true'>
-<input name='organisers_search_box' onchange='$.getJSON("/auto/json/seach-strings-canvassers?=" + organisers_search_box.text, null, function (data) {updateMenuOptions("organisers", "", [""], data);})'/>
-<br/>
 <select id='organisers' name='organisers' multiple='multiple'>
-{% for r in canvassers %}<option value='{{r.id}}' {% ifequal record.organisers r.id%}selected{% endifequal %}>{{r.username}} {{r.fullname}} {{r.address_id}} {{r.phone}} {{r.email}}</option>{% endfor %}
+{% for option in organisers %}<option value='{{option.id}}' {% ifequal record.organisers option.id%}selected{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
 <span id='organisers' name='organisers' class='pseudo-widget disabled'>
@@ -268,25 +246,137 @@ To delete this teams record
 </p>
 {% endifmemberof %}
 </form>
+<div class='auxlist'>
+<h2>
+Organisers
+</h2>
+<table>
+<thead>
+<tr>
+<th>
+Id
+</th>
+<th>
+Fullname
+</th>
+<th>
+Email
+</th>
+<th>
+Phone
+</th>
+<th>
+&nbsp;
+</th>
+</tr>
+</thead>
+<tbody>
+{% for record in organisers %}
+<tr>
+<td>
+{{ record.id }}
+</td>
+<td>
+{{ record.fullname }}
+</td>
+<td>
+{{ record.email }}
+</td>
+<td>
+{{ record.phone }}
+</td>
+<td>
+<a href='{{servlet-context}}/form-canvassers-Canvasser?id={{ record.id }}'>
+View
+</a>
+</td>
+</tr>
+{% endfor %}
+</tbody>
+</table>
+</div>
+<div class='auxlist'>
+<h2>
+Members
+</h2>
+<table>
+<thead>
+<tr>
+<th>
+Id
+</th>
+<th>
+Fullname
+</th>
+<th>
+Email
+</th>
+<th>
+Phone
+</th>
+<th>
+&nbsp;
+</th>
+</tr>
+</thead>
+<tbody>
+{% for record in members %}
+<tr>
+<td>
+{{ record.id }}
+</td>
+<td>
+{{ record.fullname }}
+</td>
+<td>
+{{ record.email }}
+</td>
+<td>
+{{ record.phone }}
+</td>
+<td>
+<a href='{{servlet-context}}/form-canvassers-Canvasser?id={{ record.id }}'>
+View
+</a>
+</td>
+</tr>
+{% endfor %}
+</tbody>
+</table>
+</div>
 </div>
 
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `district_id`.
+ */
+$('#district_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
 
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
 
 </script>
 
diff --git a/resources/templates/auto/form-visits-Visit.html b/resources/templates/auto/form-visits-Visit.html
index 6264d3e..054c475 100644
--- a/resources/templates/auto/form-visits-Visit.html
+++ b/resources/templates/auto/form-visits-Visit.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
-<!-- File form-visits-Visit.html generated 2018-07-09T20:55:34.524Z by adl.to-selmer-templates.
+<!-- File form-visits-Visit.html generated 2018-07-10T15:25:24.201Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
 {% block extra-head %}
 
+           {% script "/js/lib/node_modules/selectize/dist/js/standalone/selectize.min.js" %}
+           {% style "/js/lib/node_modules/selectize/dist/css/selectize.css" %}
 {% endblock %}
 {% block content %}
 <div id='content' class='edit'>
@@ -18,7 +20,7 @@ Id
 {% ifmemberof admin %}
 <input id='id' name='id' type='number' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
-{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers %}
+{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
 {{record.id}}
 </span>
@@ -32,7 +34,7 @@ You are not permitted to view id of visits
 {% ifmemberof admin %}
 <input id='id' name='id' type='number' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
-{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers %}
+{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
 {{record.id}}
 </span>
@@ -50,15 +52,11 @@ Address_id
 </label>
 {% if {{record.address_id}} %}
 {% ifmemberof admin %}
-<span class='select-box' farside='addresses' found='true'>
-<input name='address_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-addresses?postcode=" + address_id_search_box.text + "&amp;address=" + address_id_search_box.text, null, function (data) {updateMenuOptions("address_id", "id", ["postcode", "address"], data);})'/>
-<br/>
 <select id='address_id' name='address_id'>
-{% for r in addresses %}<option value='{{r.id}}' {% ifequal record.address_id r.id%}selected{% endifequal %}>{{r.address}} {{r.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
-{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers %}
+{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
 <span id='address_id' name='address_id' class='pseudo-widget disabled'>
 {{record.address_id}}
 </span>
@@ -70,15 +68,11 @@ You are not permitted to view address_id of visits
 {% endifmemberof %}
 {% else %}
 {% ifmemberof admin %}
-<span class='select-box' farside='addresses' found='true'>
-<input name='address_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-addresses?postcode=" + address_id_search_box.text + "&amp;address=" + address_id_search_box.text, null, function (data) {updateMenuOptions("address_id", "id", ["postcode", "address"], data);})'/>
-<br/>
 <select id='address_id' name='address_id'>
-{% for r in addresses %}<option value='{{r.id}}' {% ifequal record.address_id r.id%}selected{% endifequal %}>{{r.address}} {{r.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
-{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers %}
+{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
 <span id='address_id' name='address_id' class='pseudo-widget disabled'>
 {{record.address_id}}
 </span>
@@ -96,15 +90,11 @@ Canvasser_id
 </label>
 {% if {{record.canvasser_id}} %}
 {% ifmemberof admin %}
-<span class='select-box' farside='canvassers' found='true'>
-<input name='canvasser_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-canvassers?=" + canvasser_id_search_box.text, null, function (data) {updateMenuOptions("canvasser_id", "", [""], data);})'/>
-<br/>
 <select id='canvasser_id' name='canvasser_id'>
-{% for r in canvassers %}<option value='{{r.id}}' {% ifequal record.canvasser_id r.id%}selected{% endifequal %}>{{r.username}} {{r.fullname}} {{r.address_id}} {{r.phone}} {{r.email}}</option>{% endfor %}
+{% for option in canvasser_id %}<option value='{{option.id}}' {% ifequal record.canvasser_id option.id%}selected{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
-{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers %}
+{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
 <span id='canvasser_id' name='canvasser_id' class='pseudo-widget disabled'>
 {{record.canvasser_id}}
 </span>
@@ -116,15 +106,11 @@ You are not permitted to view canvasser_id of visits
 {% endifmemberof %}
 {% else %}
 {% ifmemberof admin %}
-<span class='select-box' farside='canvassers' found='true'>
-<input name='canvasser_id_search_box' onchange='$.getJSON("/auto/json/seach-strings-canvassers?=" + canvasser_id_search_box.text, null, function (data) {updateMenuOptions("canvasser_id", "", [""], data);})'/>
-<br/>
 <select id='canvasser_id' name='canvasser_id'>
-{% for r in canvassers %}<option value='{{r.id}}' {% ifequal record.canvasser_id r.id%}selected{% endifequal %}>{{r.username}} {{r.fullname}} {{r.address_id}} {{r.phone}} {{r.email}}</option>{% endfor %}
+{% for option in canvasser_id %}<option value='{{option.id}}' {% ifequal record.canvasser_id option.id%}selected{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
-</span>
 {% else %}
-{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers %}
+{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
 <span id='canvasser_id' name='canvasser_id' class='pseudo-widget disabled'>
 {{record.canvasser_id}}
 </span>
@@ -144,7 +130,7 @@ Date
 {% ifmemberof admin %}
 <input id='date' name='date' type='string' value='{{record.date}}' maxlength='' size='16'/>
 {% else %}
-{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers %}
+{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
 <span id='date' name='date' class='pseudo-widget disabled'>
 {{record.date}}
 </span>
@@ -158,7 +144,7 @@ You are not permitted to view date of visits
 {% ifmemberof admin %}
 <input id='date' name='date' type='string' value='{{record.date}}' maxlength='' size='16'/>
 {% else %}
-{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers %}
+{% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
 <span id='date' name='date' class='pseudo-widget disabled'>
 {{record.date}}
 </span>
@@ -192,20 +178,63 @@ To delete this visits record
 {% endblock %}
 {% block extra-tail %}
 <script type='text/javascript'>
-        /**
-         * update the select menu with id `wid` from this `data` whose fields include
-         * this `entity_key` and these `fields`
-         */
-        function updateMenuOptions(wid, entity_key, fields, data){
-          $('#' + wid).children().filter(function(){
-            return $(this).attr('selected') === undefined;
-          }).remove().end();
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `address_id`.
+ */
+$('#address_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
 
-          $.each(data, function(key, entry){
-            $('#' + wid).append(
-              $('<option></option>').attr('value', key).text(entry));
-          });
-        }
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
+
+/**
+ * selectize one select widget. Substitute the actual id of the widget for `canvasser_id`.
+ */
+$('#canvasser_id').selectize({
+  valueField: 'id',
+  labelField: 'name',
+  searchField: 'name',
+  options: [],
+  create: false,
+
+  load: function(query, callback) {
+    console.log('Desperately seeking ' + query);
+    if (query === null || !query.length) return callback();
+    $.ajax({
+      url: '/json/auto/search-strings-electors?name=' + query,
+      type: 'GET',
+      dataType: 'jsonp',
+      error: function() {
+        console.log( 'Query ' + query + ' failed.');
+        callback();
+      },
+      success: function(res) {
+        console.log('Received ' + res + ' records for ' + query);
+        callback(res);
+      }
+    });
+  }
+});
 
 </script>
 
diff --git a/resources/templates/auto/list-addresses-Addresses.html b/resources/templates/auto/list-addresses-Addresses.html
index 178130e..89859d6 100644
--- a/resources/templates/auto/list-addresses-Addresses.html
+++ b/resources/templates/auto/list-addresses-Addresses.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-addresses-Addresses.html generated 2018-07-09T20:55:34.533Z by adl.to-selmer-templates.
+<!-- File list-addresses-Addresses.html generated 2018-07-10T15:25:24.208Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-authorities-Authorities.html b/resources/templates/auto/list-authorities-Authorities.html
index 4e44398..b270314 100644
--- a/resources/templates/auto/list-authorities-Authorities.html
+++ b/resources/templates/auto/list-authorities-Authorities.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-authorities-Authorities.html generated 2018-07-09T20:55:34.510Z by adl.to-selmer-templates.
+<!-- File list-authorities-Authorities.html generated 2018-07-10T15:25:24.194Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-canvassers-Canvassers.html b/resources/templates/auto/list-canvassers-Canvassers.html
index c248fce..cd8b39d 100644
--- a/resources/templates/auto/list-canvassers-Canvassers.html
+++ b/resources/templates/auto/list-canvassers-Canvassers.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-canvassers-Canvassers.html generated 2018-07-09T20:55:34.545Z by adl.to-selmer-templates.
+<!-- File list-canvassers-Canvassers.html generated 2018-07-10T15:25:24.216Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -54,18 +54,9 @@ Username
 Fullname
 </th>
 <th>
-Elector_id
-</th>
-<th>
 Address_id
 </th>
 <th>
-Phone
-</th>
-<th>
-Email
-</th>
-<th>
 Authority_id
 </th>
 <th>
@@ -86,18 +77,9 @@ Authorised
 <input id='fullname' type='text' name='fullname' value='{{ params.fullname }}'/>
 </th>
 <th>
-<input id='elector_id_expanded' type='text' name='elector_id_expanded' value='{{ params.elector_id_expanded }}'/>
-</th>
-<th>
 <input id='address_id_expanded' type='text' name='address_id_expanded' value='{{ params.address_id_expanded }}'/>
 </th>
 <th>
-<input id='phone' type='text' name='phone' value='{{ params.phone }}'/>
-</th>
-<th>
-<input id='email' type='text' name='email' value='{{ params.email }}'/>
-</th>
-<th>
 <input id='authority_id_expanded' type='text' name='authority_id_expanded' value='{{ params.authority_id_expanded }}'/>
 </th>
 <th>
@@ -121,22 +103,11 @@ Authorised
 {{ record.fullname }}
 </td>
 <td>
-<a href='{{servlet-context}}/form-electors-Elector?id={{ record.elector_id }}'>
-{{ record.elector_id_expanded }}
-</a>
-</td>
-<td>
 <a href='{{servlet-context}}/form-addresses-Address?id={{ record.address_id }}'>
 {{ record.address_id_expanded }}
 </a>
 </td>
 <td>
-{{ record.phone }}
-</td>
-<td>
-{{ record.email }}
-</td>
-<td>
 <a href='{{servlet-context}}/form-authorities-Authority?id={{ record.authority_id }}'>
 {{ record.authority_id_expanded }}
 </a>
diff --git a/resources/templates/auto/list-districts-Districts.html b/resources/templates/auto/list-districts-Districts.html
index f52b318..45f039e 100644
--- a/resources/templates/auto/list-districts-Districts.html
+++ b/resources/templates/auto/list-districts-Districts.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-districts-Districts.html generated 2018-07-09T20:55:34.538Z by adl.to-selmer-templates.
+<!-- File list-districts-Districts.html generated 2018-07-10T15:25:24.212Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-dwellings-Dwellings.html b/resources/templates/auto/list-dwellings-Dwellings.html
index 7b96078..5874acc 100644
--- a/resources/templates/auto/list-dwellings-Dwellings.html
+++ b/resources/templates/auto/list-dwellings-Dwellings.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-dwellings-Dwellings.html generated 2018-07-09T20:55:34.531Z by adl.to-selmer-templates.
+<!-- File list-dwellings-Dwellings.html generated 2018-07-10T15:25:24.206Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-electors-Electors.html b/resources/templates/auto/list-electors-Electors.html
index 23066a3..4d3db15 100644
--- a/resources/templates/auto/list-electors-Electors.html
+++ b/resources/templates/auto/list-electors-Electors.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-electors-Electors.html generated 2018-07-09T20:55:34.519Z by adl.to-selmer-templates.
+<!-- File list-electors-Electors.html generated 2018-07-10T15:25:24.197Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-events-Events.html b/resources/templates/auto/list-events-Events.html
index 3f75ff3..0b864e8 100644
--- a/resources/templates/auto/list-events-Events.html
+++ b/resources/templates/auto/list-events-Events.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-events-Events.html generated 2018-07-09T20:55:34.539Z by adl.to-selmer-templates.
+<!-- File list-events-Events.html generated 2018-07-10T15:25:24.212Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-followupactions-Followupactions.html b/resources/templates/auto/list-followupactions-Followupactions.html
index e80590e..2c20687 100644
--- a/resources/templates/auto/list-followupactions-Followupactions.html
+++ b/resources/templates/auto/list-followupactions-Followupactions.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-followupactions-Followupactions.html generated 2018-07-09T20:55:34.544Z by adl.to-selmer-templates.
+<!-- File list-followupactions-Followupactions.html generated 2018-07-10T15:25:24.215Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -57,9 +57,6 @@ Actor
 Date
 </th>
 <th>
-Notes
-</th>
-<th>
 Closed
 </th>
 <th>
@@ -80,9 +77,6 @@ Closed
 <input id='date' type='date' name='date' value='{{ params.date }}'/>
 </th>
 <th>
-<input id='notes' type='text' name='notes' value='{{ params.notes }}'/>
-</th>
-<th>
 <input id='closed' type='text' name='closed' value='{{ params.closed }}'/>
 </th>
 <th>
@@ -110,9 +104,6 @@ Closed
 {{ record.date }}
 </td>
 <td>
-{{ record.notes }}
-</td>
-<td>
 {{ record.closed }}
 </td>
 <td>
diff --git a/resources/templates/auto/list-followupmethods-Followupmethods.html b/resources/templates/auto/list-followupmethods-Followupmethods.html
index 802c3ce..c0bf1bf 100644
--- a/resources/templates/auto/list-followupmethods-Followupmethods.html
+++ b/resources/templates/auto/list-followupmethods-Followupmethods.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-followupmethods-Followupmethods.html generated 2018-07-09T20:55:34.524Z by adl.to-selmer-templates.
+<!-- File list-followupmethods-Followupmethods.html generated 2018-07-10T15:25:24.201Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-followuprequests-Followuprequests.html b/resources/templates/auto/list-followuprequests-Followuprequests.html
index 80dc44a..dacaf20 100644
--- a/resources/templates/auto/list-followuprequests-Followuprequests.html
+++ b/resources/templates/auto/list-followuprequests-Followuprequests.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-followuprequests-Followuprequests.html generated 2018-07-09T20:55:34.506Z by adl.to-selmer-templates.
+<!-- File list-followuprequests-Followuprequests.html generated 2018-07-10T15:25:24.192Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -26,7 +26,7 @@ Previous
 Next
 </a>
 </div>
-{% ifmemberof admin %}
+{% ifmemberof %}
 <div class='big-link-container'>
 <a href='{{servlet-context}}/form-followuprequests-Followuprequest' class='big-link'>
 Add a new Followuprequest
diff --git a/resources/templates/auto/list-genders-Genders.html b/resources/templates/auto/list-genders-Genders.html
index c57b3f5..a0566ce 100644
--- a/resources/templates/auto/list-genders-Genders.html
+++ b/resources/templates/auto/list-genders-Genders.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-genders-Genders.html generated 2018-07-09T20:55:34.500Z by adl.to-selmer-templates.
+<!-- File list-genders-Genders.html generated 2018-07-10T15:25:24.188Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-intentions-Intentions.html b/resources/templates/auto/list-intentions-Intentions.html
index eff1228..e7a53cb 100644
--- a/resources/templates/auto/list-intentions-Intentions.html
+++ b/resources/templates/auto/list-intentions-Intentions.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-intentions-Intentions.html generated 2018-07-09T20:55:34.548Z by adl.to-selmer-templates.
+<!-- File list-intentions-Intentions.html generated 2018-07-10T15:25:24.217Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -26,7 +26,7 @@ Previous
 Next
 </a>
 </div>
-{% ifmemberof admin %}
+{% ifmemberof %}
 <div class='big-link-container'>
 <a href='{{servlet-context}}/form-intentions-Intention' class='big-link'>
 Add a new Intention
diff --git a/resources/templates/auto/list-issues-Issues.html b/resources/templates/auto/list-issues-Issues.html
index 0d86ea9..7d6c584 100644
--- a/resources/templates/auto/list-issues-Issues.html
+++ b/resources/templates/auto/list-issues-Issues.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-issues-Issues.html generated 2018-07-09T20:55:34.541Z by adl.to-selmer-templates.
+<!-- File list-issues-Issues.html generated 2018-07-10T15:25:24.213Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-options-Options.html b/resources/templates/auto/list-options-Options.html
index f82dead..61776f2 100644
--- a/resources/templates/auto/list-options-Options.html
+++ b/resources/templates/auto/list-options-Options.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-options-Options.html generated 2018-07-09T20:55:34.507Z by adl.to-selmer-templates.
+<!-- File list-options-Options.html generated 2018-07-10T15:25:24.193Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-roles-Roles.html b/resources/templates/auto/list-roles-Roles.html
index 435d974..e29e58f 100644
--- a/resources/templates/auto/list-roles-Roles.html
+++ b/resources/templates/auto/list-roles-Roles.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-roles-Roles.html generated 2018-07-09T20:55:34.523Z by adl.to-selmer-templates.
+<!-- File list-roles-Roles.html generated 2018-07-10T15:25:24.200Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-teams-Teams.html b/resources/templates/auto/list-teams-Teams.html
index fb3765f..d7a8317 100644
--- a/resources/templates/auto/list-teams-Teams.html
+++ b/resources/templates/auto/list-teams-Teams.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-teams-Teams.html generated 2018-07-09T20:55:34.504Z by adl.to-selmer-templates.
+<!-- File list-teams-Teams.html generated 2018-07-10T15:25:24.190Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-visits-Visits.html b/resources/templates/auto/list-visits-Visits.html
index b7bc0f8..9a0c704 100644
--- a/resources/templates/auto/list-visits-Visits.html
+++ b/resources/templates/auto/list-visits-Visits.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File list-visits-Visits.html generated 2018-07-09T20:55:34.502Z by adl.to-selmer-templates.
+<!-- File list-visits-Visits.html generated 2018-07-10T15:25:24.189Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/base.html b/resources/templates/base.html
index 0efcadf..5eedb33 100644
--- a/resources/templates/base.html
+++ b/resources/templates/base.html
@@ -78,7 +78,7 @@
         <div>
           <img height="16" width="16" alt="Clojure" src="{{servlet-context}}/img/credits/luminus-logo.png"/>Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
           <img height="16" width="16" alt="Clojure" src="{{servlet-context}}/img/credits/clojure-icon.gif"/> Powered by <a href="http://clojure.org">Clojure</a> ||
-          <img height="16" width="16" alt="GitHub" src="{{servlet-context}}/img/credits/github-logo-transparent.png"/>Find me/fork me on <a href="https://github.com/simon-brooke/smeagol">Github</a> ||
+          <img height="16" width="16" alt="GitHub" src="{{servlet-context}}/img/credits/github-logo-transparent.png"/>Find me/fork me on <a href="https://github.com/simon-brooke/youyesyet">Github</a> ||
           <img height="16" width="16" alt="Free Software Foundation" src="{{servlet-context}}/img/credits/gnu.small.png"/>Licensed under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</a>
         </div>
       </div>
diff --git a/src/clj/youyesyet/layout.clj b/src/clj/youyesyet/layout.clj
index 11ded3a..a1acac4 100644
--- a/src/clj/youyesyet/layout.clj
+++ b/src/clj/youyesyet/layout.clj
@@ -63,9 +63,12 @@
 (defn render
   "renders the HTML `template` located relative to resources/templates in
   the context of this session and with these parameters."
+  ;; TODO: I'm passing `session` through into render. The default luminus
+  ;; setup doesn't do this, and Dmitri is an awful lot better at this stuff
+  ;; than me so there's almost certainly a reason it doesn't.
   [template session & [params]]
   (let [user (:user session)]
-    (log/debug (str "layout/render: template: '" template "'; user: '" user "'."))
+    (log/debug (str "layout/render: template: '" template "'; user: '" (:username user)))
     (content-type
       (ok
         (parser/render-file
diff --git a/src/clj/youyesyet/routes/auto.clj b/src/clj/youyesyet/routes/auto.clj
index a7617e6..a36d14b 100644
--- a/src/clj/youyesyet/routes/auto.clj
+++ b/src/clj/youyesyet/routes/auto.clj
@@ -1,11 +1,12 @@
 (ns
  youyesyet.routes.auto
- "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180709T205534.030Z"
+ "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180710T152523.603Z"
  (:require
   [adl-support.core :as support]
   [clojure.java.io :as io]
   [clojure.set :refer [subset?]]
   [clojure.tools.logging :as log]
+  [clojure.walk :refer [keywordize-keys]]
   [compojure.core :refer [defroutes GET POST]]
   [hugsql.core :as hugsql]
   [noir.response :as nresponse]
@@ -25,865 +26,1329 @@
 
 (defn
  list-addresses-Addresses
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-addresses-Addresses.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Addresses", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-addresses db/*db* p)
-      (db/list-addresses db/*db* {}))}))))
+    {:title "Addresses", :params params}
+    (let
+     [records
+      (if
+       (some
+        #{:locality :address :phone :postcode :longitude :district_id
+          :id :latitude}
+        (keys params))
+       (support/do-or-log-error
+        (db/search-strings-addresses db/*db* params)
+        :message
+        "Error while searching address records"
+        :error-return
+        {:warnings ["Error while searching address records"]})
+       (support/do-or-log-error
+        (db/list-addresses db/*db* {})
+        :message
+        "Error while fetching address records"
+        :error-return
+        {:warnings ["Error while fetching address records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-addresses-Address
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-addresses-Address.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Address", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do
-          (db/update-address! db/*db* p)
-          {:message "Updated record"})
-         (do (db/create-address! db/*db* p) {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-address db/*db* p))})
-     (list {:districts (db/list-districts db/*db*)}))))))
+    {:title "Address", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-address db/*db* params)
+       :message
+       (str "Error while fetching address record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching address record " params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :district_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-district db/*db* {:id (:district_id record)})
+          :message
+          "Error while fetching district record {:id (:district_id record)}")
+         (support/do-or-log-error
+          (db/list-districts db/*db*)
+          :message
+          "Error while fetching district list"))))})))))
 
 (defn
  list-authorities-Authorities
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-authorities-Authorities.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Authorities", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-authorities db/*db* p)
-      (db/list-authorities db/*db* {}))}))))
+    {:title "Authorities", :params params}
+    (let
+     [records
+      (if
+       (some
+        #{:access-token-uri :request-token-uri :authorize-uri :id
+          :consumer-secret :consumer-key}
+        (keys params))
+       (support/do-or-log-error
+        (db/search-strings-authorities db/*db* params)
+        :message
+        "Error while searching authority records"
+        :error-return
+        {:warnings ["Error while searching authority records"]})
+       (support/do-or-log-error
+        (db/list-authorities db/*db* {})
+        :message
+        "Error while fetching authority records"
+        :error-return
+        {:warnings ["Error while fetching authority records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-authorities-Authority
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-authorities-Authority.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Authority", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do
-          (db/update-authority! db/*db* p)
-          {:message "Updated record"})
-         (do
-          (db/create-authority! db/*db* p)
-          {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-authority db/*db* p))})
-     (list))))))
+    {:title "Authority", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-authority db/*db* params)
+       :message
+       (str "Error while fetching authority record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching authority record " params)]})]
+     {:error (:warnings record), :record (dissoc record :warnings)})))))
 
 (defn
  list-canvassers-Canvassers
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-canvassers-Canvassers.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Canvassers", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-canvassers db/*db* p)
-      (db/list-canvassers db/*db* {}))}))))
+    {:title "Canvassers", :params params}
+    (let
+     [records
+      (if
+       (some
+        #{:email :phone :roles :username :fullname :bio :elector_id
+          :expertise :id :avatar :address_id :authority_id :authorised}
+        (keys params))
+       (support/do-or-log-error
+        (db/search-strings-canvassers db/*db* params)
+        :message
+        "Error while searching canvasser records"
+        :error-return
+        {:warnings ["Error while searching canvasser records"]})
+       (support/do-or-log-error
+        (db/list-canvassers db/*db* {})
+        :message
+        "Error while fetching canvasser records"
+        :error-return
+        {:warnings ["Error while fetching canvasser records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-canvassers-Canvasser
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-canvassers-Canvasser.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Canvasser", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do
-          (db/update-canvasser! db/*db* p)
-          {:message "Updated record"})
-         (do
-          (db/create-canvasser! db/*db* p)
-          {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-canvasser db/*db* p))})
-     (list
-      {:electors (db/list-electors db/*db*)}
-      {:addresses (db/list-addresses db/*db*)}
-      {:authorities (db/list-authorities db/*db*)}
-      {:roles (db/list-roles db/*db*)}
-      {:issues (db/list-issues db/*db*)}))))))
+    {:title "Canvasser", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-canvasser db/*db* params)
+       :message
+       (str "Error while fetching canvasser record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching canvasser record " params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :elector_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-elector db/*db* {:id (:elector_id record)})
+          :message
+          "Error while fetching elector record {:id (:elector_id record)}")
+         (support/do-or-log-error
+          (db/list-electors db/*db*)
+          :message
+          "Error while fetching elector list")))),
+      :address_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-address db/*db* {:id (:address_id record)})
+          :message
+          "Error while fetching address record {:id (:address_id record)}")
+         (support/do-or-log-error
+          (db/list-addresses db/*db*)
+          :message
+          "Error while fetching address list")))),
+      :authority_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-authority db/*db* {:id (:authority_id record)})
+          :message
+          "Error while fetching authority record {:id (:authority_id record)}")
+         (support/do-or-log-error
+          (db/list-authorities db/*db*)
+          :message
+          "Error while fetching authority list")))),
+      :roles
+      (flatten
+       (remove
+        nil?
+        (list
+         nil
+         (support/do-or-log-error
+          (db/list-roles db/*db*)
+          :message
+          "Error while fetching role list")))),
+      :expertise
+      (flatten
+       (remove
+        nil?
+        (list
+         nil
+         (support/do-or-log-error
+          (db/list-issues db/*db*)
+          :message
+          "Error while fetching issue list"))))})))))
 
 (defn
  list-districts-Districts
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-districts-Districts.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Districts", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-districts db/*db* p)
-      (db/list-districts db/*db* {}))}))))
+    {:title "Districts", :params params}
+    (let
+     [records
+      (if
+       (some #{:name :id} (keys params))
+       (support/do-or-log-error
+        (db/search-strings-districts db/*db* params)
+        :message
+        "Error while searching district records"
+        :error-return
+        {:warnings ["Error while searching district records"]})
+       (support/do-or-log-error
+        (db/list-districts db/*db* {})
+        :message
+        "Error while fetching district records"
+        :error-return
+        {:warnings ["Error while fetching district records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-districts-District
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-districts-District.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "District", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do
-          (db/update-district! db/*db* p)
-          {:message "Updated record"})
-         (do
-          (db/create-district! db/*db* p)
-          {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-district db/*db* p))})
-     (list))))))
+    {:title "District", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-district db/*db* params)
+       :message
+       (str "Error while fetching district record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching district record " params)]})]
+     {:error (:warnings record), :record (dissoc record :warnings)})))))
 
 (defn
  list-dwellings-Dwellings
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-dwellings-Dwellings.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Dwellings", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-dwellings db/*db* p)
-      (db/list-dwellings db/*db* {}))}))))
+    {:title "Dwellings", :params params}
+    (let
+     [records
+      (if
+       (some #{:id :address_id :sub-address} (keys params))
+       (support/do-or-log-error
+        (db/search-strings-dwellings db/*db* params)
+        :message
+        "Error while searching dwelling records"
+        :error-return
+        {:warnings ["Error while searching dwelling records"]})
+       (support/do-or-log-error
+        (db/list-dwellings db/*db* {})
+        :message
+        "Error while fetching dwelling records"
+        :error-return
+        {:warnings ["Error while fetching dwelling records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-dwellings-Dwelling
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-dwellings-Dwelling.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Dwelling", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do
-          (db/update-dwelling! db/*db* p)
-          {:message "Updated record"})
-         (do
-          (db/create-dwelling! db/*db* p)
-          {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-dwelling db/*db* p))})
-     (list {:addresses (db/list-addresses db/*db*)}))))))
+    {:title "Dwelling", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-dwelling db/*db* params)
+       :message
+       (str "Error while fetching dwelling record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching dwelling record " params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :address_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-address db/*db* {:id (:address_id record)})
+          :message
+          "Error while fetching address record {:id (:address_id record)}")
+         (support/do-or-log-error
+          (db/list-addresses db/*db*)
+          :message
+          "Error while fetching address list"))))})))))
 
 (defn
  list-electors-Electors
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-electors-Electors.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Electors", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-electors db/*db* p)
-      (db/list-electors db/*db* {}))}))))
+    {:title "Electors", :params params}
+    (let
+     [records
+      (if
+       (some
+        #{:email :phone :name :dwelling_id :id :gender}
+        (keys params))
+       (support/do-or-log-error
+        (db/search-strings-electors db/*db* params)
+        :message
+        "Error while searching elector records"
+        :error-return
+        {:warnings ["Error while searching elector records"]})
+       (support/do-or-log-error
+        (db/list-electors db/*db* {})
+        :message
+        "Error while fetching elector records"
+        :error-return
+        {:warnings ["Error while fetching elector records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-electors-Elector
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-electors-Elector.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Elector", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do
-          (db/update-elector! db/*db* p)
-          {:message "Updated record"})
-         (do (db/create-elector! db/*db* p) {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-elector db/*db* p))})
-     (list
-      {:dwellings (db/list-dwellings db/*db*)}
-      {:genders (db/list-genders db/*db*)}))))))
+    {:title "Elector", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-elector db/*db* params)
+       :message
+       (str "Error while fetching elector record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching elector record " params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :dwelling_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-dwelling db/*db* {:id (:dwelling_id record)})
+          :message
+          "Error while fetching dwelling record {:id (:dwelling_id record)}")
+         (support/do-or-log-error
+          (db/list-dwellings db/*db*)
+          :message
+          "Error while fetching dwelling list")))),
+      :gender
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-gender db/*db* {:id (:gender record)})
+          :message
+          "Error while fetching gender record {:id (:gender record)}")
+         (support/do-or-log-error
+          (db/list-genders db/*db*)
+          :message
+          "Error while fetching gender list"))))})))))
 
 (defn
  form-events-Events
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-events-Events.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Events", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do (db/update-event! db/*db* p) {:message "Updated record"})
-         (do (db/create-event! db/*db* p) {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-event db/*db* p))})
-     (list {:teams (db/list-teams db/*db*)}))))))
+    {:title "Events", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-event db/*db* params)
+       :message
+       (str "Error while fetching event record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching event record " params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :teams
+      (flatten
+       (remove
+        nil?
+        (list
+         nil
+         (support/do-or-log-error
+          (db/list-teams db/*db*)
+          :message
+          "Error while fetching team list"))))})))))
 
 (defn
  list-events-Events
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-events-Events.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Events", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-events db/*db* p)
-      (db/list-events db/*db* {}))}))))
+    {:title "Events", :params params}
+    (let
+     [records
+      (if
+       (some
+        #{:date :name :time :teams :cancelled :decription :id}
+        (keys params))
+       (support/do-or-log-error
+        (db/search-strings-events db/*db* params)
+        :message
+        "Error while searching event records"
+        :error-return
+        {:warnings ["Error while searching event records"]})
+       (support/do-or-log-error
+        (db/list-events db/*db* {})
+        :message
+        "Error while fetching event records"
+        :error-return
+        {:warnings ["Error while fetching event records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  list-followupactions-Followupactions
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template
     "list-followupactions-Followupactions.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Followupactions", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-followupactions db/*db* p)
-      (db/list-followupactions db/*db* {}))}))))
+    {:title "Followupactions", :params params}
+    (let
+     [records
+      (if
+       (some
+        #{:closed :date :id :notes :request_id :actor}
+        (keys params))
+       (support/do-or-log-error
+        (db/search-strings-followupactions db/*db* params)
+        :message
+        "Error while searching followupaction records"
+        :error-return
+        {:warnings ["Error while searching followupaction records"]})
+       (support/do-or-log-error
+        (db/list-followupactions db/*db* {})
+        :message
+        "Error while fetching followupaction records"
+        :error-return
+        {:warnings ["Error while fetching followupaction records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-followupactions-Followupaction
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template
     "form-followupactions-Followupaction.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Followupaction", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do
-          (db/update-followupaction! db/*db* p)
-          {:message "Updated record"})
-         (do
-          (db/create-followupaction! db/*db* p)
-          {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-followupaction db/*db* p))})
-     (list
-      {:followuprequests (db/list-followuprequests db/*db*)}
-      {:canvassers (db/list-canvassers db/*db*)}))))))
+    {:title "Followupaction", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-followupaction db/*db* params)
+       :message
+       (str "Error while fetching followupaction record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching followupaction record " params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :request_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-followuprequest db/*db* {:id (:request_id record)})
+          :message
+          "Error while fetching followuprequest record {:id (:request_id record)}")
+         (support/do-or-log-error
+          (db/list-followuprequests db/*db*)
+          :message
+          "Error while fetching followuprequest list")))),
+      :actor
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-canvasser db/*db* {:id (:actor record)})
+          :message
+          "Error while fetching canvasser record {:id (:actor record)}")
+         (support/do-or-log-error
+          (db/list-canvassers db/*db*)
+          :message
+          "Error while fetching canvasser list"))))})))))
 
 (defn
  list-followupmethods-Followupmethods
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template
     "list-followupmethods-Followupmethods.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Followupmethods", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-followupmethods db/*db* p)
-      (db/list-followupmethods db/*db* {}))}))))
+    {:title "Followupmethods", :params params}
+    (let
+     [records
+      (if
+       (some #{:id} (keys params))
+       (support/do-or-log-error
+        (db/search-strings-followupmethods db/*db* params)
+        :message
+        "Error while searching followupmethod records"
+        :error-return
+        {:warnings ["Error while searching followupmethod records"]})
+       (support/do-or-log-error
+        (db/list-followupmethods db/*db* {})
+        :message
+        "Error while fetching followupmethod records"
+        :error-return
+        {:warnings ["Error while fetching followupmethod records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-followupmethods-Followupmethod
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template
     "form-followupmethods-Followupmethod.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Followupmethod", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do
-          (db/update-followupmethod! db/*db* p)
-          {:message "Updated record"})
-         (do
-          (db/create-followupmethod! db/*db* p)
-          {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-followupmethod db/*db* p))})
-     (list))))))
+    {:title "Followupmethod", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-followupmethod db/*db* params)
+       :message
+       (str "Error while fetching followupmethod record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching followupmethod record " params)]})]
+     {:error (:warnings record), :record (dissoc record :warnings)})))))
 
 (defn
  list-followuprequests-Followuprequests
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template
     "list-followuprequests-Followuprequests.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Followuprequests", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-followuprequests db/*db* p)
-      (db/list-followuprequests db/*db* {}))}))))
+    {:title "Followuprequests", :params params}
+    (let
+     [records
+      (if
+       (some
+        #{:issue_id :visit_id :elector_id :id :method_id}
+        (keys params))
+       (support/do-or-log-error
+        (db/search-strings-followuprequests db/*db* params)
+        :message
+        "Error while searching followuprequest records"
+        :error-return
+        {:warnings ["Error while searching followuprequest records"]})
+       (support/do-or-log-error
+        (db/list-followuprequests db/*db* {})
+        :message
+        "Error while fetching followuprequest records"
+        :error-return
+        {:warnings ["Error while fetching followuprequest records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-followuprequests-Followuprequest
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template
     "form-followuprequests-Followuprequest.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Followuprequest", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do
-          (db/update-followuprequest! db/*db* p)
-          {:message "Updated record"})
-         (do
-          (db/create-followuprequest! db/*db* p)
-          {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-followuprequest db/*db* p))})
-     (list
-      {:electors (db/list-electors db/*db*)}
-      {:visits (db/list-visits db/*db*)}
-      {:issues (db/list-issues db/*db*)}
-      {:followupmethods (db/list-followupmethods db/*db*)}))))))
+    {:title "Followuprequest", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-followuprequest db/*db* params)
+       :message
+       (str "Error while fetching followuprequest record " params)
+       :error-return
+       {:warnings
+        [(str
+          "Error while fetching followuprequest record "
+          params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :elector_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-elector db/*db* {:id (:elector_id record)})
+          :message
+          "Error while fetching elector record {:id (:elector_id record)}")
+         (support/do-or-log-error
+          (db/list-electors db/*db*)
+          :message
+          "Error while fetching elector list")))),
+      :visit_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-visit db/*db* {:id (:visit_id record)})
+          :message
+          "Error while fetching visit record {:id (:visit_id record)}")
+         (support/do-or-log-error
+          (db/list-visits db/*db*)
+          :message
+          "Error while fetching visit list")))),
+      :issue_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-issue db/*db* {:id (:issue_id record)})
+          :message
+          "Error while fetching issue record {:id (:issue_id record)}")
+         (support/do-or-log-error
+          (db/list-issues db/*db*)
+          :message
+          "Error while fetching issue list")))),
+      :method_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-followupmethod db/*db* {:id (:method_id record)})
+          :message
+          "Error while fetching followupmethod record {:id (:method_id record)}")
+         (support/do-or-log-error
+          (db/list-followupmethods db/*db*)
+          :message
+          "Error while fetching followupmethod list"))))})))))
 
 (defn
  list-genders-Genders
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-genders-Genders.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Genders", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-genders db/*db* p)
-      (db/list-genders db/*db* {}))}))))
+    {:title "Genders", :params params}
+    (let
+     [records
+      (if
+       (some #{:id} (keys params))
+       (support/do-or-log-error
+        (db/search-strings-genders db/*db* params)
+        :message
+        "Error while searching gender records"
+        :error-return
+        {:warnings ["Error while searching gender records"]})
+       (support/do-or-log-error
+        (db/list-genders db/*db* {})
+        :message
+        "Error while fetching gender records"
+        :error-return
+        {:warnings ["Error while fetching gender records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-genders-Gender
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-genders-Gender.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Gender", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do (db/update-gender! db/*db* p) {:message "Updated record"})
-         (do (db/create-gender! db/*db* p) {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-gender db/*db* p))})
-     (list))))))
+    {:title "Gender", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-gender db/*db* params)
+       :message
+       (str "Error while fetching gender record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching gender record " params)]})]
+     {:error (:warnings record), :record (dissoc record :warnings)})))))
 
 (defn
  list-intentions-Intentions
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-intentions-Intentions.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Intentions", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-intentions db/*db* p)
-      (db/list-intentions db/*db* {}))}))))
+    {:title "Intentions", :params params}
+    (let
+     [records
+      (if
+       (some
+        #{:locality :option_id :visit_id :elector_id :id}
+        (keys params))
+       (support/do-or-log-error
+        (db/search-strings-intentions db/*db* params)
+        :message
+        "Error while searching intention records"
+        :error-return
+        {:warnings ["Error while searching intention records"]})
+       (support/do-or-log-error
+        (db/list-intentions db/*db* {})
+        :message
+        "Error while fetching intention records"
+        :error-return
+        {:warnings ["Error while fetching intention records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-intentions-Intention
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-intentions-Intention.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Intention", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do
-          (db/update-intention! db/*db* p)
-          {:message "Updated record"})
-         (do
-          (db/create-intention! db/*db* p)
-          {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-intention db/*db* p))})
-     (list
-      {:visits (db/list-visits db/*db*)}
-      {:electors (db/list-electors db/*db*)}
-      {:options (db/list-options db/*db*)}))))))
+    {:title "Intention", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-intention db/*db* params)
+       :message
+       (str "Error while fetching intention record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching intention record " params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :visit_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-visit db/*db* {:id (:visit_id record)})
+          :message
+          "Error while fetching visit record {:id (:visit_id record)}")
+         (support/do-or-log-error
+          (db/list-visits db/*db*)
+          :message
+          "Error while fetching visit list")))),
+      :elector_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-elector db/*db* {:id (:elector_id record)})
+          :message
+          "Error while fetching elector record {:id (:elector_id record)}")
+         (support/do-or-log-error
+          (db/list-electors db/*db*)
+          :message
+          "Error while fetching elector list")))),
+      :option_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-option db/*db* {:id (:option_id record)})
+          :message
+          "Error while fetching option record {:id (:option_id record)}")
+         (support/do-or-log-error
+          (db/list-options db/*db*)
+          :message
+          "Error while fetching option list"))))})))))
 
 (defn
  list-issues-Issues
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-issues-Issues.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Issues", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-issues db/*db* p)
-      (db/list-issues db/*db* {}))}))))
+    {:title "Issues", :params params}
+    (let
+     [records
+      (if
+       (some #{:experts :brief :id :current :url} (keys params))
+       (support/do-or-log-error
+        (db/search-strings-issues db/*db* params)
+        :message
+        "Error while searching issue records"
+        :error-return
+        {:warnings ["Error while searching issue records"]})
+       (support/do-or-log-error
+        (db/list-issues db/*db* {})
+        :message
+        "Error while fetching issue records"
+        :error-return
+        {:warnings ["Error while fetching issue records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-issues-Issue
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-issues-Issue.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Issue", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do (db/update-issue! db/*db* p) {:message "Updated record"})
-         (do (db/create-issue! db/*db* p) {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-issue db/*db* p))})
-     (list {:canvassers (db/list-canvassers db/*db*)}))))))
+    {:title "Issue", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-issue db/*db* params)
+       :message
+       (str "Error while fetching issue record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching issue record " params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :experts
+      (flatten
+       (remove
+        nil?
+        (list
+         nil
+         (support/do-or-log-error
+          (db/list-canvassers db/*db*)
+          :message
+          "Error while fetching canvasser list"))))})))))
 
 (defn
  list-options-Options
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-options-Options.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Options", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-options db/*db* p)
-      (db/list-options db/*db* {}))}))))
+    {:title "Options", :params params}
+    (let
+     [records
+      (if
+       (some #{:id} (keys params))
+       (support/do-or-log-error
+        (db/search-strings-options db/*db* params)
+        :message
+        "Error while searching option records"
+        :error-return
+        {:warnings ["Error while searching option records"]})
+       (support/do-or-log-error
+        (db/list-options db/*db* {})
+        :message
+        "Error while fetching option records"
+        :error-return
+        {:warnings ["Error while fetching option records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-options-Option
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-options-Option.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Option", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do (db/update-option! db/*db* p) {:message "Updated record"})
-         (do (db/create-option! db/*db* p) {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-option db/*db* p))})
-     (list))))))
+    {:title "Option", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-option db/*db* params)
+       :message
+       (str "Error while fetching option record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching option record " params)]})]
+     {:error (:warnings record), :record (dissoc record :warnings)})))))
 
 (defn
  list-roles-Roles
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-roles-Roles.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Roles", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-roles db/*db* p)
-      (db/list-roles db/*db* {}))}))))
+    {:title "Roles", :params params}
+    (let
+     [records
+      (if
+       (some #{:name :id :members} (keys params))
+       (support/do-or-log-error
+        (db/search-strings-roles db/*db* params)
+        :message
+        "Error while searching role records"
+        :error-return
+        {:warnings ["Error while searching role records"]})
+       (support/do-or-log-error
+        (db/list-roles db/*db* {})
+        :message
+        "Error while fetching role records"
+        :error-return
+        {:warnings ["Error while fetching role records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-roles-Role
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-roles-Role.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Role", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do (db/update-role! db/*db* p) {:message "Updated record"})
-         (do (db/create-role! db/*db* p) {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-role db/*db* p))})
-     (list {:canvassers (db/list-canvassers db/*db*)}))))))
+    {:title "Role", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-role db/*db* params)
+       :message
+       (str "Error while fetching role record " params)
+       :error-return
+       {:warnings [(str "Error while fetching role record " params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :members
+      (flatten
+       (remove
+        nil?
+        (list
+         nil
+         (support/do-or-log-error
+          (db/list-canvassers db/*db*)
+          :message
+          "Error while fetching canvasser list"))))})))))
 
 (defn
  list-teams-Teams
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-teams-Teams.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Teams", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-teams db/*db* p)
-      (db/list-teams db/*db* {}))}))))
+    {:title "Teams", :params params}
+    (let
+     [records
+      (if
+       (some
+        #{:name :organisers :longitude :district_id :id :latitude
+          :members}
+        (keys params))
+       (support/do-or-log-error
+        (db/search-strings-teams db/*db* params)
+        :message
+        "Error while searching team records"
+        :error-return
+        {:warnings ["Error while searching team records"]})
+       (support/do-or-log-error
+        (db/list-teams db/*db* {})
+        :message
+        "Error while fetching team records"
+        :error-return
+        {:warnings ["Error while fetching team records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-teams-Team
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-teams-Team.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Team", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do (db/update-team! db/*db* p) {:message "Updated record"})
-         (do (db/create-team! db/*db* p) {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-team db/*db* p))})
-     (list
-      {:districts (db/list-districts db/*db*)}
-      {:canvassers (db/list-canvassers db/*db*)}
-      {:canvassers (db/list-canvassers db/*db*)}))))))
+    {:title "Team", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-team db/*db* params)
+       :message
+       (str "Error while fetching team record " params)
+       :error-return
+       {:warnings [(str "Error while fetching team record " params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :district_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-district db/*db* {:id (:district_id record)})
+          :message
+          "Error while fetching district record {:id (:district_id record)}")
+         (support/do-or-log-error
+          (db/list-districts db/*db*)
+          :message
+          "Error while fetching district list")))),
+      :members
+      (flatten
+       (remove
+        nil?
+        (list
+         nil
+         (support/do-or-log-error
+          (db/list-canvassers db/*db*)
+          :message
+          "Error while fetching canvasser list")))),
+      :organisers
+      (flatten
+       (remove
+        nil?
+        (list
+         nil
+         (support/do-or-log-error
+          (db/list-canvassers db/*db*)
+          :message
+          "Error while fetching canvasser list"))))})))))
 
 (defn
  list-visits-Visits
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "list-visits-Visits.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Visits", :params p}
-    {:records
-     (if
-      (not (empty? (remove nil? (vals p))))
-      (db/search-strings-visits db/*db* p)
-      (db/list-visits db/*db* {}))}))))
+    {:title "Visits", :params params}
+    (let
+     [records
+      (if
+       (some #{:canvasser_id :date :id :address_id} (keys params))
+       (support/do-or-log-error
+        (db/search-strings-visits db/*db* params)
+        :message
+        "Error while searching visit records"
+        :error-return
+        {:warnings ["Error while searching visit records"]})
+       (support/do-or-log-error
+        (db/list-visits db/*db* {})
+        :message
+        "Error while fetching visit records"
+        :error-return
+        {:warnings ["Error while fetching visit records"]}))]
+     (if (:warnings records) records {:records records}))))))
 
 (defn
  form-visits-Visit
- [r]
+ [request]
  (let
-  [p (support/massage-params (:params r) (:form-params r) #{"id"})]
+  [params
+   (support/massage-params
+    (keywordize-keys (:params request))
+    (keywordize-keys (:form-params request))
+    #{:id})]
   (l/render
    (support/resolve-template "form-visits-Visit.html")
-   (:session r)
+   (:session request)
    (merge
-    {:title "Visit", :params p}
-    (reduce
-     merge
-     (merge
-      (cond
-       (:save-button p)
-       (try
-        (if
-         (some #{"id"} (map name (keys p)))
-         (do (db/update-visit! db/*db* p) {:message "Updated record"})
-         (do (db/create-visit! db/*db* p) {:message "Saved record"}))
-        (catch
-         java.lang.Exception
-         any__2085__auto__
-         {:error (.getMessage any__2085__auto__)})))
-      {:record
-       (if
-        (empty? (remove nil? (vals p)))
-        []
-        (db/get-visit db/*db* p))})
-     (list
-      {:addresses (db/list-addresses db/*db*)}
-      {:canvassers (db/list-canvassers db/*db*)}))))))
+    {:title "Visit", :params params}
+    (let
+     [record
+      (support/do-or-log-error
+       (db/get-visit db/*db* params)
+       :message
+       (str "Error while fetching visit record " params)
+       :error-return
+       {:warnings
+        [(str "Error while fetching visit record " params)]})]
+     {:error (:warnings record),
+      :record (dissoc record :warnings),
+      :address_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-address db/*db* {:id (:address_id record)})
+          :message
+          "Error while fetching address record {:id (:address_id record)}")
+         (support/do-or-log-error
+          (db/list-addresses db/*db*)
+          :message
+          "Error while fetching address list")))),
+      :canvasser_id
+      (flatten
+       (remove
+        nil?
+        (list
+         (support/do-or-log-error
+          (db/get-canvasser db/*db* {:id (:canvasser_id record)})
+          :message
+          "Error while fetching canvasser record {:id (:canvasser_id record)}")
+         (support/do-or-log-error
+          (db/list-canvassers db/*db*)
+          :message
+          "Error while fetching canvasser list"))))})))))
 
 (defn
  raw-resolve-handler
diff --git a/src/clj/youyesyet/routes/auto_json.clj b/src/clj/youyesyet/routes/auto_json.clj
index a9ca15f..b6a33eb 100644
--- a/src/clj/youyesyet/routes/auto_json.clj
+++ b/src/clj/youyesyet/routes/auto_json.clj
@@ -1,6 +1,6 @@
 (ns
  youyesyet.routes.auto-json
- "JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180709T205532.861Z"
+ "JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180710T152522.387Z"
  (:require
   [adl-support.core :as support]
   [clojure.core.memoize :as memo]
diff --git a/youyesyet.adl.xml b/youyesyet.adl.xml
index a284309..884879d 100644
--- a/youyesyet.adl.xml
+++ b/youyesyet.adl.xml
@@ -82,16 +82,14 @@ version="0.1.1">
     column="dwelling_id" entity="dwellings" farkey="id">
       <prompt prompt="Home" locale="en-GB"/>
     </property>
-    <property size="16" type="string" name="phone" column="phone"
-    distinct="user">
+    <property size="16" type="string" name="phone" column="phone">
       <prompt prompt="Phone" locale="en-GB"/>
     </property>
-    <property size="128" type="string" name="email" column="email"
-    distinct="user">
+    <property size="128" type="string" name="email" column="email">
       <prompt prompt="Email" locale="en-GB"/>
     </property>
     <property name="gender" type="entity" column="gender"
-    entity="genders" farkey="id" default="Unknown" distinct="user">
+    entity="genders" farkey="id" default="Unknown">
       <prompt prompt="Gender" locale="en-GB"/>
     </property>
     <list properties="listed" name="Electors">
@@ -170,9 +168,7 @@ version="0.1.1">
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
-    entity dwellings already has a key - not generating one
-    -->
+
   <entity table="dwellings" name="dwellings" magnitude="6"
   volatility="6">
     <documentation>All dwellings within addresses in the system; a
@@ -229,9 +225,7 @@ version="0.1.1">
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
-    entity addresses already has a key - not generating one
-    -->
+
   <entity table="addresses" name="addresses" magnitude="6"
   volatility="6">
     <documentation>Addresses of all buildings which contain
@@ -263,6 +257,7 @@ version="0.1.1">
     <property type="real" name="longitude" column="longitude">
       <prompt prompt="Longitude" locale="en-GB"/>
     </property>
+    <!-- property name="dwellings" type="link" entity="dwelling"/ -->
     <property type="integer" name="locality" column="locality">
       <documentation>Locality indexing; see issue #44. Note that
       this property should be generated automatically from the
@@ -320,6 +315,9 @@ version="0.1.1">
       <field property="longitude">
         <prompt prompt="Longitude" locale="en-GB"/>
       </field>
+      <auxlist property="dwellings">
+        <field name="sub-address"/>
+      </auxlist>
     </form>
     <permission group="canvassers" permission="read"/>
     <permission group="teamorganisers" permission="read"/>
@@ -341,6 +339,7 @@ version="0.1.1">
         <prompt prompt="id" locale="en-GB"/>
       </property>
     </key>
+    <!-- TODO: should visit be keyed against dwelling rather than address? -->
     <property required="true" type="entity" name="address_id"
     column="address_id" entity="addresses" farkey="id"
     distinct="user">
@@ -362,7 +361,7 @@ version="0.1.1">
     <permission group="issueexperts" permission="read"/>
     <permission group="analysts" permission="read"/>
     <permission group="issueeditors" permission="read"/>
-    <permission group="admin" permission="all"/>
+    <permission group="admin" permission="noedit"/>
     <list properties="listed" name="Visits">
       <field property="id">
         <prompt prompt="id" locale="en-GB"/>
@@ -542,7 +541,7 @@ version="0.1.1">
     <permission group="issueexperts" permission="none"/>
     <permission group="analysts" permission="read"/>
     <permission group="issueeditors" permission="none"/>
-    <permission group="admin" permission="all"/>
+    <permission group="admin" permission="noedit"/>
     <list properties="listed" name="Intentions">
       <field property="visit_id">
         <prompt prompt="visit_id" locale="en-GB"/>
@@ -608,12 +607,12 @@ version="0.1.1">
     </property>
     <property type="entity" name="elector_id" column="elector_id"
     entity="electors" farkey="id">
-      <prompt prompt="elector_id" locale="en-GB"/>
+      <prompt prompt="Electoral roll entry" locale="en-GB"/>
     </property>
     <property required="true" type="entity" name="address_id"
     column="address_id" entity="addresses" farkey="id"
     distinct="user">
-      <prompt prompt="address_id" locale="en-GB"/>
+      <prompt prompt="address" locale="en-GB"/>
     </property>
     <property type="string" name="phone" column="phone" size="16"
     distinct="user">
@@ -658,17 +657,8 @@ version="0.1.1">
       <field property="fullname">
         <prompt prompt="fullname" locale="en-GB"/>
       </field>
-      <field property="elector_id">
-        <prompt prompt="elector_id" locale="en-GB"/>
-      </field>
       <field property="address_id">
-        <prompt prompt="address_id" locale="en-GB"/>
-      </field>
-      <field property="phone">
-        <prompt prompt="phone" locale="en-GB"/>
-      </field>
-      <field property="email">
-        <prompt prompt="email" locale="en-GB"/>
+        <prompt prompt="address" locale="en-GB"/>
       </field>
       <field property="authority_id">
         <prompt prompt="authority_id" locale="en-GB"/>
@@ -687,11 +677,13 @@ version="0.1.1">
       <field property="fullname">
         <prompt prompt="fullname" locale="en-GB"/>
       </field>
+      <field property="avatar"/>
+      <field property="bio"/>
       <field property="elector_id">
-        <prompt prompt="elector_id" locale="en-GB"/>
+        <prompt prompt="Electoral roll entry" locale="en-GB"/>
       </field>
       <field property="address_id">
-        <prompt prompt="address_id" locale="en-GB"/>
+        <prompt prompt="address" locale="en-GB"/>
       </field>
       <field property="phone">
         <prompt prompt="phone" locale="en-GB"/>
@@ -786,7 +778,7 @@ version="0.1.1">
     <permission group="issueexperts" permission="read"/>
     <permission group="analysts" permission="read"/>
     <permission group="issueeditors" permission="read"/>
-    <permission group="admin" permission="all"/>
+    <permission group="admin" permission="noedit"/>
   </entity>
 
   <entity table="roles" name="roles" magnitude="1" volatility="7">
@@ -913,7 +905,7 @@ version="0.1.1">
         <prompt prompt="Organisers" locale="en-GB"/>
         <field property="id">
         </field>
-        <field property="name">
+        <field property="fullname">
           <prompt prompt="name" locale="en-GB"/>
         </field>
         <field property="email">
@@ -927,7 +919,7 @@ version="0.1.1">
         <prompt prompt="Members" locale="en-GB"/>
         <field property="id">
         </field>
-        <field property="name">
+        <field property="fullname">
           <prompt prompt="name" locale="en-GB"/>
         </field>
         <field property="email">
@@ -1062,9 +1054,6 @@ version="0.1.1">
       <field property="date">
         <prompt prompt="date" locale="en-GB"/>
       </field>
-      <field property="notes">
-        <prompt prompt="notes" locale="en-GB"/>
-      </field>
       <field property="closed">
         <prompt prompt="closed" locale="en-GB"/>
       </field>
@@ -1134,6 +1123,7 @@ version="0.1.1">
     -->
   <entity table="followupmethods" name="followupmethods"
   magnitude="1" volatility="7">
+    <documentation>Methods which may be used to follow up a followup request. Reference data.</documentation>
     <key>
       <property required="true" type="string" size="32" name="id"
       column="id" immutable="true" distinct="all">
diff --git a/youyesyet.canonical.adl.xml b/youyesyet.canonical.adl.xml
index 57e96b4..11e2031 100644
--- a/youyesyet.canonical.adl.xml
+++ b/youyesyet.canonical.adl.xml
@@ -87,13 +87,13 @@
     <property required="true" type="entity" name="dwelling_id" column="dwelling_id" entity="dwellings" farkey="id">
       <prompt prompt="Home" locale="en-GB"/>
     </property>
-    <property size="16" type="string" name="phone" column="phone" distinct="user">
+    <property size="16" type="string" name="phone" column="phone">
       <prompt prompt="Phone" locale="en-GB"/>
     </property>
-    <property size="128" type="string" name="email" column="email" distinct="user">
+    <property size="128" type="string" name="email" column="email">
       <prompt prompt="Email" locale="en-GB"/>
     </property>
-    <property name="gender" type="entity" column="gender" entity="genders" farkey="id" default="Unknown" distinct="user">
+    <property name="gender" type="entity" column="gender" entity="genders" farkey="id" default="Unknown">
       <prompt prompt="Gender" locale="en-GB"/>
     </property>
     <list properties="listed" name="Electors">
@@ -254,6 +254,7 @@
     <property type="real" name="longitude" column="longitude">
       <prompt prompt="Longitude" locale="en-GB"/>
     </property>
+    <!-- property name="dwellings" type="link" entity="dwelling"/ -->
     <property type="integer" name="locality" column="locality">
       <documentation>Locality indexing; see issue #44. Note that
       this property should be generated automatically from the
@@ -311,6 +312,9 @@
       <field property="longitude">
         <prompt prompt="Longitude" locale="en-GB"/>
       </field>
+      <auxlist property="dwellings">
+        <field name="sub-address"/>
+      </auxlist>
     </form>
     <permission group="canvassers" permission="read"/>
     <permission group="teamorganisers" permission="read"/>
@@ -330,6 +334,7 @@
         <prompt prompt="id" locale="en-GB"/>
       </property>
     </key>
+    <!-- TODO: should visit be keyed against dwelling rather than address? -->
     <property required="true" type="entity" name="address_id" column="address_id" entity="addresses" farkey="id" distinct="user">
       <prompt prompt="Address" locale="en-GB"/>
     </property>
@@ -347,7 +352,7 @@
     <permission group="issueexperts" permission="read"/>
     <permission group="analysts" permission="read"/>
     <permission group="issueeditors" permission="read"/>
-    <permission group="admin" permission="all"/>
+    <permission group="admin" permission="noedit"/>
     <list properties="listed" name="Visits">
       <field property="id">
         <prompt prompt="id" locale="en-GB"/>
@@ -518,7 +523,7 @@
     <permission group="issueexperts" permission="none"/>
     <permission group="analysts" permission="read"/>
     <permission group="issueeditors" permission="none"/>
-    <permission group="admin" permission="all"/>
+    <permission group="admin" permission="noedit"/>
     <list properties="listed" name="Intentions">
       <field property="visit_id">
         <prompt prompt="visit_id" locale="en-GB"/>
@@ -581,10 +586,10 @@
       <prompt prompt="Bio" locale="en-GB"/>
     </property>
     <property type="entity" name="elector_id" column="elector_id" entity="electors" farkey="id">
-      <prompt prompt="elector_id" locale="en-GB"/>
+      <prompt prompt="Electoral roll entry" locale="en-GB"/>
     </property>
     <property required="true" type="entity" name="address_id" column="address_id" entity="addresses" farkey="id" distinct="user">
-      <prompt prompt="address_id" locale="en-GB"/>
+      <prompt prompt="address" locale="en-GB"/>
     </property>
     <property type="string" name="phone" column="phone" size="16" distinct="user">
       <prompt prompt="phone" locale="en-GB"/>
@@ -625,17 +630,8 @@
       <field property="fullname">
         <prompt prompt="fullname" locale="en-GB"/>
       </field>
-      <field property="elector_id">
-        <prompt prompt="elector_id" locale="en-GB"/>
-      </field>
       <field property="address_id">
-        <prompt prompt="address_id" locale="en-GB"/>
-      </field>
-      <field property="phone">
-        <prompt prompt="phone" locale="en-GB"/>
-      </field>
-      <field property="email">
-        <prompt prompt="email" locale="en-GB"/>
+        <prompt prompt="address" locale="en-GB"/>
       </field>
       <field property="authority_id">
         <prompt prompt="authority_id" locale="en-GB"/>
@@ -654,11 +650,13 @@
       <field property="fullname">
         <prompt prompt="fullname" locale="en-GB"/>
       </field>
+      <field property="avatar"/>
+      <field property="bio"/>
       <field property="elector_id">
-        <prompt prompt="elector_id" locale="en-GB"/>
+        <prompt prompt="Electoral roll entry" locale="en-GB"/>
       </field>
       <field property="address_id">
-        <prompt prompt="address_id" locale="en-GB"/>
+        <prompt prompt="address" locale="en-GB"/>
       </field>
       <field property="phone">
         <prompt prompt="phone" locale="en-GB"/>
@@ -748,7 +746,7 @@
     <permission group="issueexperts" permission="read"/>
     <permission group="analysts" permission="read"/>
     <permission group="issueeditors" permission="read"/>
-    <permission group="admin" permission="all"/>
+    <permission group="admin" permission="noedit"/>
   </entity>
   <!--
     entity roles already has a key - not generating one
@@ -874,7 +872,7 @@
         <prompt prompt="Organisers" locale="en-GB"/>
         <field property="id">
         </field>
-        <field property="name">
+        <field property="fullname">
           <prompt prompt="name" locale="en-GB"/>
         </field>
         <field property="email">
@@ -888,7 +886,7 @@
         <prompt prompt="Members" locale="en-GB"/>
         <field property="id">
         </field>
-        <field property="name">
+        <field property="fullname">
           <prompt prompt="name" locale="en-GB"/>
         </field>
         <field property="email">
@@ -1019,9 +1017,6 @@
       <field property="date">
         <prompt prompt="date" locale="en-GB"/>
       </field>
-      <field property="notes">
-        <prompt prompt="notes" locale="en-GB"/>
-      </field>
       <field property="closed">
         <prompt prompt="closed" locale="en-GB"/>
       </field>
@@ -1088,6 +1083,7 @@
     entity followupmethods already has a key - not generating one
     -->
   <entity table="followupmethods" name="followupmethods" magnitude="1" volatility="7">
+    <documentation>Methods which may be used to follow up a followup request. Reference data.</documentation>
     <key>
       <property required="true" type="string" size="32" name="id" column="id" immutable="true" distinct="all">
         <prompt prompt="id" locale="en-GB"/>