From b65223198c6ab6dae5171d2f199b2676565f7372 Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Sun, 15 Jul 2018 12:42:32 +0100
Subject: [PATCH] Minor fix to ADL - wrong capitalisation

Plus regenerated files.
---
 resources/sql/queries.auto.sql                |  2 +-
 resources/sql/youyesyet.postgres.sql          |  2 +-
 .../templates/auto/application-index.html     |  2 +-
 .../auto/form-addresses-Address.html          | 13 ++---
 .../auto/form-authorities-Authority.html      |  2 +-
 .../auto/form-canvassers-Canvasser.html       | 32 ++++++------
 .../auto/form-districts-District.html         |  2 +-
 .../auto/form-dwellings-Dwelling.html         | 13 ++---
 .../templates/auto/form-electors-Elector.html | 17 +++---
 .../templates/auto/form-events-Events.html    |  6 +--
 .../form-followupactions-Followupaction.html  | 24 +++++----
 .../form-followupmethods-Followupmethod.html  |  2 +-
 ...form-followuprequests-Followuprequest.html | 32 ++++++------
 .../templates/auto/form-genders-Gender.html   |  2 +-
 .../auto/form-intentions-Intention.html       | 28 +++++-----
 .../templates/auto/form-issues-Issue.html     |  2 +-
 .../templates/auto/form-options-Option.html   |  2 +-
 resources/templates/auto/form-roles-Role.html |  6 +--
 resources/templates/auto/form-teams-Team.html | 21 ++++----
 .../templates/auto/form-visits-Visit.html     | 24 +++++----
 .../auto/list-addresses-Addresses.html        | 10 ++--
 .../auto/list-authorities-Authorities.html    |  2 +-
 .../auto/list-canvassers-Canvassers.html      |  2 +-
 .../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 |  2 +-
 .../list-followupmethods-Followupmethods.html |  2 +-
 ...ist-followuprequests-Followuprequests.html |  2 +-
 .../templates/auto/list-genders-Genders.html  |  2 +-
 .../auto/list-intentions-Intentions.html      |  2 +-
 .../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 +-
 src/clj/youyesyet/routes/auto.clj             |  2 +-
 src/clj/youyesyet/routes/auto_json.clj        |  2 +-
 src/cljs/youyesyet/canvasser_app/core.cljs    |  1 -
 src/cljs/youyesyet/issue_expert_app/README.md |  5 --
 src/cljs/youyesyet/issue_expert_app/core.cljs |  0
 .../issue_expert_app/views/list.cljs          | 52 -------------------
 youyesyet.adl.xml                             |  8 +--
 youyesyet.canonical.adl.xml                   |  8 +--
 45 files changed, 155 insertions(+), 199 deletions(-)
 delete mode 100644 src/cljs/youyesyet/issue_expert_app/README.md
 delete mode 100644 src/cljs/youyesyet/issue_expert_app/core.cljs
 delete mode 100644 src/cljs/youyesyet/issue_expert_app/views/list.cljs

diff --git a/resources/sql/queries.auto.sql b/resources/sql/queries.auto.sql
index fa45e72..14bfc7c 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-10T15:25:22.228Z 
+--	autogenerated by adl.to-hugsql-queries at 2018-07-15T11:36:34.811Z 
 --	
 --	See [Application Description 
 --	Language](https://github.com/simon-brooke/adl). 
diff --git a/resources/sql/youyesyet.postgres.sql b/resources/sql/youyesyet.postgres.sql
index da16031..83c052d 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 20180710T152523.324Z 
+--	(https://github.com/simon-brooke/adl) at 20180715T113635.982Z 
 --	
 --	A web-app intended to be used by canvassers
 --	  campaigning for a 'Yes' vote in the second independence
diff --git a/resources/templates/auto/application-index.html b/resources/templates/auto/application-index.html
index cc4b7c6..ae12f05 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-10T15:25:24.202Z by adl.to-selmer-templates.
+<!-- File application-index.html generated 2018-07-15T11:36:36.877Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/form-addresses-Address.html b/resources/templates/auto/form-addresses-Address.html
index 47c154a..06943d0 100644
--- a/resources/templates/auto/form-addresses-Address.html
+++ b/resources/templates/auto/form-addresses-Address.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-addresses-Address.html generated 2018-07-10T15:25:24.196Z by adl.to-selmer-templates.
+<!-- File form-addresses-Address.html generated 2018-07-15T11:36:36.868Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -122,7 +122,7 @@ District_id
 {% if {{record.district_id}} %}
 {% ifmemberof admin %}
 <select id='district_id' name='district_id'>
-{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -138,7 +138,7 @@ You are not permitted to view district_id of addresses
 {% else %}
 {% ifmemberof admin %}
 <select id='district_id' name='district_id'>
-{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -244,13 +244,14 @@ To delete this addresses record
 {% block extra-tail %}
 <script type='text/javascript'>
 /**
- * selectize one select widget. Substitute the actual id of the widget for `district_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `district_id`,
+ * and the current value for {{record.district_id}}.
  */
 $('#district_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -270,7 +271,7 @@ $('#district_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.district_id}}, true);
 
 </script>
 
diff --git a/resources/templates/auto/form-authorities-Authority.html b/resources/templates/auto/form-authorities-Authority.html
index ae00757..19ec701 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-10T15:25:24.207Z by adl.to-selmer-templates.
+<!-- File form-authorities-Authority.html generated 2018-07-15T11:36:36.882Z 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 67341bb..4d03140 100644
--- a/resources/templates/auto/form-canvassers-Canvasser.html
+++ b/resources/templates/auto/form-canvassers-Canvasser.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-canvassers-Canvasser.html generated 2018-07-10T15:25:24.210Z by adl.to-selmer-templates.
+<!-- File form-canvassers-Canvasser.html generated 2018-07-15T11:36:36.886Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -162,7 +162,7 @@ Elector_id
 {% if {{record.elector_id}} %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
 <select id='elector_id' name='elector_id'>
-{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -178,7 +178,7 @@ You are not permitted to view elector_id of canvassers
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
 <select id='elector_id' name='elector_id'>
-{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -200,7 +200,7 @@ Address_id
 {% if {{record.address_id}} %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
 <select id='address_id' name='address_id'>
-{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected='selected'{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -216,7 +216,7 @@ You are not permitted to view address_id of canvassers
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
 <select id='address_id' name='address_id'>
-{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected='selected'{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -306,7 +306,7 @@ Authority_id
 {% if {{record.authority_id}} %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
 <select id='authority_id' name='authority_id'>
-{% for option in authority_id %}<option value='{{option.id}}' {% ifequal record.authority_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
+{% for option in authority_id %}<option value='{{option.id}}' {% ifequal record.authority_id option.id%}selected='selected'{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -322,7 +322,7 @@ You are not permitted to view authority_id of canvassers
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
 <select id='authority_id' name='authority_id'>
-{% for option in authority_id %}<option value='{{option.id}}' {% ifequal record.authority_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
+{% for option in authority_id %}<option value='{{option.id}}' {% ifequal record.authority_id option.id%}selected='selected'{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -378,7 +378,7 @@ Roles
 {% if {{record.roles}} %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
 <select id='roles' name='roles' multiple='multiple'>
-{% for option in roles %}<option value='{{option.role_id}}' {% ifequal record.roles option.role_id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in roles %}<option value='{{option.role_id}}' {% ifequal record.roles option.role_id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -394,7 +394,7 @@ You are not permitted to view roles of canvassers
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
 <select id='roles' name='roles' multiple='multiple'>
-{% for option in roles %}<option value='{{option.role_id}}' {% ifequal record.roles option.role_id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in roles %}<option value='{{option.role_id}}' {% ifequal record.roles option.role_id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -432,13 +432,14 @@ To delete this canvassers record
 {% block extra-tail %}
 <script type='text/javascript'>
 /**
- * selectize one select widget. Substitute the actual id of the widget for `elector_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `elector_id`,
+ * and the current value for {{record.elector_id}}.
  */
 $('#elector_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -458,16 +459,17 @@ $('#elector_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.elector_id}}, true);
 
 /**
- * selectize one select widget. Substitute the actual id of the widget for `address_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `address_id`,
+ * and the current value for {{record.address_id}}.
  */
 $('#address_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -487,7 +489,7 @@ $('#address_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.address_id}}, true);
 
           var simplemde = new SimpleMDE({
             autosave: {
diff --git a/resources/templates/auto/form-districts-District.html b/resources/templates/auto/form-districts-District.html
index 816fcfc..5c05ea3 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-10T15:25:24.193Z by adl.to-selmer-templates.
+<!-- File form-districts-District.html generated 2018-07-15T11:36:36.863Z 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 d06a363..3f24208 100644
--- a/resources/templates/auto/form-dwellings-Dwelling.html
+++ b/resources/templates/auto/form-dwellings-Dwelling.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-dwellings-Dwelling.html generated 2018-07-10T15:25:24.216Z by adl.to-selmer-templates.
+<!-- File form-dwellings-Dwelling.html generated 2018-07-15T11:36:36.894Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -20,7 +20,7 @@ Address_id
 {% if {{record.address_id}} %}
 {% ifmemberof admin %}
 <select id='address_id' name='address_id'>
-{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected='selected'{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -36,7 +36,7 @@ You are not permitted to view address_id of dwellings
 {% else %}
 {% ifmemberof admin %}
 <select id='address_id' name='address_id'>
-{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected='selected'{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -108,13 +108,14 @@ To delete this dwellings record
 {% block extra-tail %}
 <script type='text/javascript'>
 /**
- * selectize one select widget. Substitute the actual id of the widget for `address_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `address_id`,
+ * and the current value for {{record.address_id}}.
  */
 $('#address_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -134,7 +135,7 @@ $('#address_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.address_id}}, true);
 
 </script>
 
diff --git a/resources/templates/auto/form-electors-Elector.html b/resources/templates/auto/form-electors-Elector.html
index 2a566f1..20a19f5 100644
--- a/resources/templates/auto/form-electors-Elector.html
+++ b/resources/templates/auto/form-electors-Elector.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-electors-Elector.html generated 2018-07-10T15:25:24.205Z by adl.to-selmer-templates.
+<!-- File form-electors-Elector.html generated 2018-07-15T11:36:36.880Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -54,7 +54,7 @@ Dwelling_id
 {% if {{record.dwelling_id}} %}
 {% ifmemberof admin %}
 <select id='dwelling_id' name='dwelling_id'>
-{% 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 %}
+{% for option in dwelling_id %}<option value='{{option.id}}' {% ifequal record.dwelling_id option.id%}selected='selected'{% endifequal %}>{{option.address_id_expanded}} {{option.sub-address}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -70,7 +70,7 @@ You are not permitted to view dwelling_id of electors
 {% else %}
 {% ifmemberof admin %}
 <select id='dwelling_id' name='dwelling_id'>
-{% 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 %}
+{% for option in dwelling_id %}<option value='{{option.id}}' {% ifequal record.dwelling_id option.id%}selected='selected'{% endifequal %}>{{option.address_id_expanded}} {{option.sub-address}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -160,7 +160,7 @@ Gender
 {% if {{record.gender}} %}
 {% ifmemberof admin %}
 <select id='gender' name='gender'>
-{% for option in gender %}<option value='{{option.id}}' {% ifequal record.gender option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
+{% for option in gender %}<option value='{{option.id}}' {% ifequal record.gender option.id%}selected='selected'{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -176,7 +176,7 @@ You are not permitted to view gender of electors
 {% else %}
 {% ifmemberof admin %}
 <select id='gender' name='gender'>
-{% for option in gender %}<option value='{{option.id}}' {% ifequal record.gender option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
+{% for option in gender %}<option value='{{option.id}}' {% ifequal record.gender option.id%}selected='selected'{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -214,13 +214,14 @@ To delete this electors record
 {% block extra-tail %}
 <script type='text/javascript'>
 /**
- * selectize one select widget. Substitute the actual id of the widget for `dwelling_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `dwelling_id`,
+ * and the current value for {{record.dwelling_id}}.
  */
 $('#dwelling_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -240,7 +241,7 @@ $('#dwelling_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.dwelling_id}}, true);
 
 </script>
 
diff --git a/resources/templates/auto/form-events-Events.html b/resources/templates/auto/form-events-Events.html
index 8238f02..b1a916e 100644
--- a/resources/templates/auto/form-events-Events.html
+++ b/resources/templates/auto/form-events-Events.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-events-Events.html generated 2018-07-10T15:25:24.209Z by adl.to-selmer-templates.
+<!-- File form-events-Events.html generated 2018-07-15T11:36:36.884Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -56,7 +56,7 @@ Teams
 {% if {{record.teams}} %}
 {% ifmemberof teamorganisers admin %}
 <select id='teams' name='teams' multiple='multiple'>
-{% for option in teams %}<option value='{{option.id}}' {% ifequal record.teams option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in teams %}<option value='{{option.id}}' {% ifequal record.teams option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -72,7 +72,7 @@ You are not permitted to view teams of events
 {% else %}
 {% ifmemberof teamorganisers admin %}
 <select id='teams' name='teams' multiple='multiple'>
-{% for option in teams %}<option value='{{option.id}}' {% ifequal record.teams option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in teams %}<option value='{{option.id}}' {% ifequal record.teams option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
diff --git a/resources/templates/auto/form-followupactions-Followupaction.html b/resources/templates/auto/form-followupactions-Followupaction.html
index f65af24..65e4b9a 100644
--- a/resources/templates/auto/form-followupactions-Followupaction.html
+++ b/resources/templates/auto/form-followupactions-Followupaction.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-followupactions-Followupaction.html generated 2018-07-10T15:25:24.218Z by adl.to-selmer-templates.
+<!-- File form-followupactions-Followupaction.html generated 2018-07-15T11:36:36.896Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -22,7 +22,7 @@ Request_id
 {% if {{record.request_id}} %}
 {% ifmemberof admin %}
 <select id='request_id' name='request_id'>
-{% 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 %}
+{% for option in request_id %}<option value='{{option.id}}' {% ifequal record.request_id option.id%}selected='selected'{% endifequal %}>{{option.elector_id_expanded}} {{option.visit_id_expanded}} {{option.issue_id_expanded}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
@@ -38,7 +38,7 @@ You are not permitted to view request_id of followupactions
 {% else %}
 {% ifmemberof admin %}
 <select id='request_id' name='request_id'>
-{% 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 %}
+{% for option in request_id %}<option value='{{option.id}}' {% ifequal record.request_id option.id%}selected='selected'{% endifequal %}>{{option.elector_id_expanded}} {{option.visit_id_expanded}} {{option.issue_id_expanded}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
@@ -60,7 +60,7 @@ Actor
 {% if {{record.actor}} %}
 {% ifmemberof admin %}
 <select id='actor' name='actor'>
-{% 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 %}
+{% for option in actor %}<option value='{{option.id}}' {% ifequal record.actor option.id%}selected='selected'{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id_expanded}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
@@ -76,7 +76,7 @@ You are not permitted to view actor of followupactions
 {% else %}
 {% ifmemberof admin %}
 <select id='actor' name='actor'>
-{% 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 %}
+{% for option in actor %}<option value='{{option.id}}' {% ifequal record.actor option.id%}selected='selected'{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id_expanded}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
@@ -220,13 +220,14 @@ To delete this followupactions record
 {% block extra-tail %}
 <script type='text/javascript'>
 /**
- * selectize one select widget. Substitute the actual id of the widget for `request_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `request_id`,
+ * and the current value for {{record.request_id}}.
  */
 $('#request_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -246,16 +247,17 @@ $('#request_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.request_id}}, true);
 
 /**
- * selectize one select widget. Substitute the actual id of the widget for `actor`.
+ * selectize one select widget. Substitute the actual id of the widget for `actor`,
+ * and the current value for {{record.actor}}.
  */
 $('#actor').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -275,7 +277,7 @@ $('#actor').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.actor}}, true);
 
           var simplemde = new SimpleMDE({
             autosave: {
diff --git a/resources/templates/auto/form-followupmethods-Followupmethod.html b/resources/templates/auto/form-followupmethods-Followupmethod.html
index a0087da..2ce3863 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-10T15:25:24.219Z by adl.to-selmer-templates.
+<!-- File form-followupmethods-Followupmethod.html generated 2018-07-15T11:36:36.897Z 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 2229a47..f5a3949 100644
--- a/resources/templates/auto/form-followuprequests-Followuprequest.html
+++ b/resources/templates/auto/form-followuprequests-Followuprequest.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-followuprequests-Followuprequest.html generated 2018-07-10T15:25:24.194Z by adl.to-selmer-templates.
+<!-- File form-followuprequests-Followuprequest.html generated 2018-07-15T11:36:36.866Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -20,7 +20,7 @@ Elector_id
 {% if {{record.elector_id}} %}
 {% ifmemberof %}
 <select id='elector_id' name='elector_id'>
-{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -36,7 +36,7 @@ You are not permitted to view elector_id of followuprequests
 {% else %}
 {% ifmemberof %}
 <select id='elector_id' name='elector_id'>
-{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -58,7 +58,7 @@ Visit_id
 {% if {{record.visit_id}} %}
 {% ifmemberof %}
 <select id='visit_id' name='visit_id'>
-{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected{% endifequal %}>{{option.address_id}} {{option.date}}</option>{% endfor %}
+{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected='selected'{% endifequal %}>{{option.address_id_expanded}} {{option.date}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -74,7 +74,7 @@ You are not permitted to view visit_id of followuprequests
 {% else %}
 {% ifmemberof %}
 <select id='visit_id' name='visit_id'>
-{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected{% endifequal %}>{{option.address_id}} {{option.date}}</option>{% endfor %}
+{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected='selected'{% endifequal %}>{{option.address_id_expanded}} {{option.date}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -96,7 +96,7 @@ Issue_id
 {% if {{record.issue_id}} %}
 {% ifmemberof %}
 <select id='issue_id' name='issue_id'>
-{% for option in issue_id %}<option value='{{option.id}}' {% ifequal record.issue_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
+{% for option in issue_id %}<option value='{{option.id}}' {% ifequal record.issue_id option.id%}selected='selected'{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -112,7 +112,7 @@ You are not permitted to view issue_id of followuprequests
 {% else %}
 {% ifmemberof %}
 <select id='issue_id' name='issue_id'>
-{% for option in issue_id %}<option value='{{option.id}}' {% ifequal record.issue_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
+{% for option in issue_id %}<option value='{{option.id}}' {% ifequal record.issue_id option.id%}selected='selected'{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -134,7 +134,7 @@ Method_id
 {% if {{record.method_id}} %}
 {% ifmemberof %}
 <select id='method_id' name='method_id'>
-{% for option in method_id %}<option value='{{option.id}}' {% ifequal record.method_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
+{% for option in method_id %}<option value='{{option.id}}' {% ifequal record.method_id option.id%}selected='selected'{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -150,7 +150,7 @@ You are not permitted to view method_id of followuprequests
 {% else %}
 {% ifmemberof %}
 <select id='method_id' name='method_id'>
-{% for option in method_id %}<option value='{{option.id}}' {% ifequal record.method_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
+{% for option in method_id %}<option value='{{option.id}}' {% ifequal record.method_id option.id%}selected='selected'{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -188,13 +188,14 @@ To delete this followuprequests record
 {% block extra-tail %}
 <script type='text/javascript'>
 /**
- * selectize one select widget. Substitute the actual id of the widget for `elector_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `elector_id`,
+ * and the current value for {{record.elector_id}}.
  */
 $('#elector_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -214,16 +215,17 @@ $('#elector_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.elector_id}}, true);
 
 /**
- * selectize one select widget. Substitute the actual id of the widget for `visit_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `visit_id`,
+ * and the current value for {{record.visit_id}}.
  */
 $('#visit_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -243,7 +245,7 @@ $('#visit_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.visit_id}}, true);
 
 </script>
 
diff --git a/resources/templates/auto/form-genders-Gender.html b/resources/templates/auto/form-genders-Gender.html
index 0a0398b..c945413 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-10T15:25:24.191Z by adl.to-selmer-templates.
+<!-- File form-genders-Gender.html generated 2018-07-15T11:36:36.860Z 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 421e196..aa36f03 100644
--- a/resources/templates/auto/form-intentions-Intention.html
+++ b/resources/templates/auto/form-intentions-Intention.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-intentions-Intention.html generated 2018-07-10T15:25:24.214Z by adl.to-selmer-templates.
+<!-- File form-intentions-Intention.html generated 2018-07-15T11:36:36.892Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -19,7 +19,7 @@ Visit_id
 {% if {{record.visit_id}} %}
 {% ifmemberof %}
 <select id='visit_id' name='visit_id'>
-{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected{% endifequal %}>{{option.address_id}} {{option.date}}</option>{% endfor %}
+{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected='selected'{% endifequal %}>{{option.address_id_expanded}} {{option.date}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
@@ -35,7 +35,7 @@ You are not permitted to view visit_id of intentions
 {% else %}
 {% ifmemberof %}
 <select id='visit_id' name='visit_id'>
-{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected{% endifequal %}>{{option.address_id}} {{option.date}}</option>{% endfor %}
+{% for option in visit_id %}<option value='{{option.id}}' {% ifequal record.visit_id option.id%}selected='selected'{% endifequal %}>{{option.address_id_expanded}} {{option.date}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
@@ -57,7 +57,7 @@ Elector_id
 {% if {{record.elector_id}} %}
 {% ifmemberof %}
 <select id='elector_id' name='elector_id'>
-{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
@@ -73,7 +73,7 @@ You are not permitted to view elector_id of intentions
 {% else %}
 {% ifmemberof %}
 <select id='elector_id' name='elector_id'>
-{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in elector_id %}<option value='{{option.id}}' {% ifequal record.elector_id option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
@@ -95,7 +95,7 @@ Option_id
 {% if {{record.option_id}} %}
 {% ifmemberof %}
 <select id='option_id' name='option_id'>
-{% for option in option_id %}<option value='{{option.id}}' {% ifequal record.option_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
+{% for option in option_id %}<option value='{{option.id}}' {% ifequal record.option_id option.id%}selected='selected'{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
@@ -111,7 +111,7 @@ You are not permitted to view option_id of intentions
 {% else %}
 {% ifmemberof %}
 <select id='option_id' name='option_id'>
-{% for option in option_id %}<option value='{{option.id}}' {% ifequal record.option_id option.id%}selected{% endifequal %}>{{option.id}}</option>{% endfor %}
+{% for option in option_id %}<option value='{{option.id}}' {% ifequal record.option_id option.id%}selected='selected'{% endifequal %}>{{option.id}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers analysts admin %}
@@ -183,13 +183,14 @@ To delete this intentions record
 {% block extra-tail %}
 <script type='text/javascript'>
 /**
- * selectize one select widget. Substitute the actual id of the widget for `visit_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `visit_id`,
+ * and the current value for {{record.visit_id}}.
  */
 $('#visit_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -209,16 +210,17 @@ $('#visit_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.visit_id}}, true);
 
 /**
- * selectize one select widget. Substitute the actual id of the widget for `elector_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `elector_id`,
+ * and the current value for {{record.elector_id}}.
  */
 $('#elector_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -238,7 +240,7 @@ $('#elector_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.elector_id}}, true);
 
 </script>
 
diff --git a/resources/templates/auto/form-issues-Issue.html b/resources/templates/auto/form-issues-Issue.html
index eed301f..095c446 100644
--- a/resources/templates/auto/form-issues-Issue.html
+++ b/resources/templates/auto/form-issues-Issue.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-issues-Issue.html generated 2018-07-10T15:25:24.198Z by adl.to-selmer-templates.
+<!-- File form-issues-Issue.html generated 2018-07-15T11:36:36.872Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/form-options-Option.html b/resources/templates/auto/form-options-Option.html
index d6d5a4e..7d41ced 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-10T15:25:24.214Z by adl.to-selmer-templates.
+<!-- File form-options-Option.html generated 2018-07-15T11:36:36.891Z 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 d7c22cd..05ee89c 100644
--- a/resources/templates/auto/form-roles-Role.html
+++ b/resources/templates/auto/form-roles-Role.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-roles-Role.html generated 2018-07-10T15:25:24.199Z by adl.to-selmer-templates.
+<!-- File form-roles-Role.html generated 2018-07-15T11:36:36.874Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -54,7 +54,7 @@ Members
 {% if {{record.members}} %}
 {% ifmemberof admin %}
 <select id='members' name='members' multiple='multiple'>
-{% 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 %}
+{% for option in members %}<option value='{{option.id}}' {% ifequal record.members option.id%}selected='selected'{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id_expanded}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
@@ -70,7 +70,7 @@ You are not permitted to view members of roles
 {% else %}
 {% ifmemberof admin %}
 <select id='members' name='members' multiple='multiple'>
-{% 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 %}
+{% for option in members %}<option value='{{option.id}}' {% ifequal record.members option.id%}selected='selected'{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id_expanded}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
diff --git a/resources/templates/auto/form-teams-Team.html b/resources/templates/auto/form-teams-Team.html
index 0e61dac..1f1c16d 100644
--- a/resources/templates/auto/form-teams-Team.html
+++ b/resources/templates/auto/form-teams-Team.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-teams-Team.html generated 2018-07-10T15:25:24.204Z by adl.to-selmer-templates.
+<!-- File form-teams-Team.html generated 2018-07-15T11:36:36.878Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -54,7 +54,7 @@ District_id
 {% if {{record.district_id}} %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
 <select id='district_id' name='district_id'>
-{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
@@ -70,7 +70,7 @@ You are not permitted to view district_id of teams
 {% else %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
 <select id='district_id' name='district_id'>
-{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected{% endifequal %}>{{option.name}}</option>{% endfor %}
+{% for option in district_id %}<option value='{{option.id}}' {% ifequal record.district_id option.id%}selected='selected'{% endifequal %}>{{option.name}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
@@ -126,7 +126,7 @@ Members
 {% if {{record.members}} %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
 <select id='members' name='members' multiple='multiple'>
-{% 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 %}
+{% for option in members %}<option value='{{option.id}}' {% ifequal record.members option.id%}selected='selected'{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id_expanded}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
@@ -142,7 +142,7 @@ You are not permitted to view members of teams
 {% else %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
 <select id='members' name='members' multiple='multiple'>
-{% 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 %}
+{% for option in members %}<option value='{{option.id}}' {% ifequal record.members option.id%}selected='selected'{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id_expanded}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
@@ -164,7 +164,7 @@ Organisers
 {% if {{record.organisers}} %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
 <select id='organisers' name='organisers' multiple='multiple'>
-{% 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 %}
+{% for option in organisers %}<option value='{{option.id}}' {% ifequal record.organisers option.id%}selected='selected'{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id_expanded}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
@@ -180,7 +180,7 @@ You are not permitted to view organisers of teams
 {% else %}
 {% ifmemberof teamorganisers admin teamorganisers admin %}
 <select id='organisers' name='organisers' multiple='multiple'>
-{% 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 %}
+{% for option in organisers %}<option value='{{option.id}}' {% ifequal record.organisers option.id%}selected='selected'{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id_expanded}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin teamorganisers admin %}
@@ -350,13 +350,14 @@ View
 {% block extra-tail %}
 <script type='text/javascript'>
 /**
- * selectize one select widget. Substitute the actual id of the widget for `district_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `district_id`,
+ * and the current value for {{record.district_id}}.
  */
 $('#district_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -376,7 +377,7 @@ $('#district_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.district_id}}, true);
 
 </script>
 
diff --git a/resources/templates/auto/form-visits-Visit.html b/resources/templates/auto/form-visits-Visit.html
index 054c475..a2e97ca 100644
--- a/resources/templates/auto/form-visits-Visit.html
+++ b/resources/templates/auto/form-visits-Visit.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-<!-- File form-visits-Visit.html generated 2018-07-10T15:25:24.201Z by adl.to-selmer-templates.
+<!-- File form-visits-Visit.html generated 2018-07-15T11:36:36.876Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -53,7 +53,7 @@ Address_id
 {% if {{record.address_id}} %}
 {% ifmemberof admin %}
 <select id='address_id' name='address_id'>
-{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected='selected'{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
@@ -69,7 +69,7 @@ You are not permitted to view address_id of visits
 {% else %}
 {% ifmemberof admin %}
 <select id='address_id' name='address_id'>
-{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
+{% for option in address_id %}<option value='{{option.id}}' {% ifequal record.address_id option.id%}selected='selected'{% endifequal %}>{{option.address}} {{option.postcode}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
@@ -91,7 +91,7 @@ Canvasser_id
 {% if {{record.canvasser_id}} %}
 {% ifmemberof admin %}
 <select id='canvasser_id' name='canvasser_id'>
-{% 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 %}
+{% for option in canvasser_id %}<option value='{{option.id}}' {% ifequal record.canvasser_id option.id%}selected='selected'{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id_expanded}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
@@ -107,7 +107,7 @@ You are not permitted to view canvasser_id of visits
 {% else %}
 {% ifmemberof admin %}
 <select id='canvasser_id' name='canvasser_id'>
-{% 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 %}
+{% for option in canvasser_id %}<option value='{{option.id}}' {% ifequal record.canvasser_id option.id%}selected='selected'{% endifequal %}>{{option.username}} {{option.fullname}} {{option.address_id_expanded}} {{option.phone}} {{option.email}}</option>{% endfor %}
 </select>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers admin %}
@@ -179,13 +179,14 @@ To delete this visits record
 {% block extra-tail %}
 <script type='text/javascript'>
 /**
- * selectize one select widget. Substitute the actual id of the widget for `address_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `address_id`,
+ * and the current value for {{record.address_id}}.
  */
 $('#address_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -205,16 +206,17 @@ $('#address_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.address_id}}, true);
 
 /**
- * selectize one select widget. Substitute the actual id of the widget for `canvasser_id`.
+ * selectize one select widget. Substitute the actual id of the widget for `canvasser_id`,
+ * and the current value for {{record.canvasser_id}}.
  */
 $('#canvasser_id').selectize({
   valueField: 'id',
   labelField: 'name',
   searchField: 'name',
-  options: [],
+  hideSelected: false,
   create: false,
 
   load: function(query, callback) {
@@ -234,7 +236,7 @@ $('#canvasser_id').selectize({
       }
     });
   }
-});
+})[0].selectize.setValue({{record.canvasser_id}}, true);
 
 </script>
 
diff --git a/resources/templates/auto/list-addresses-Addresses.html b/resources/templates/auto/list-addresses-Addresses.html
index 89859d6..67edf1f 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-10T15:25:24.208Z by adl.to-selmer-templates.
+<!-- File list-addresses-Addresses.html generated 2018-07-15T11:36:36.883Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
@@ -74,10 +74,10 @@ Longitude
 <input id='id' type='text' name='id' value='{{ params.id }}'/>
 </th>
 <th>
-<input id='Address' type='text' name='Address' value='{{ params.Address }}'/>
+<input id='address' type='text' name='address' value='{{ params.address }}'/>
 </th>
 <th>
-<input id='Postcode' type='text' name='Postcode' value='{{ params.Postcode }}'/>
+<input id='postcode' type='text' name='postcode' value='{{ params.postcode }}'/>
 </th>
 <th>
 <input id='phone' type='text' name='phone' value='{{ params.phone }}'/>
@@ -103,10 +103,10 @@ Longitude
 {{ record.id }}
 </td>
 <td>
-{{ record. }}
+{{ record.address }}
 </td>
 <td>
-{{ record. }}
+{{ record.postcode }}
 </td>
 <td>
 {{ record.phone }}
diff --git a/resources/templates/auto/list-authorities-Authorities.html b/resources/templates/auto/list-authorities-Authorities.html
index b270314..dfa7115 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-10T15:25:24.194Z by adl.to-selmer-templates.
+<!-- File list-authorities-Authorities.html generated 2018-07-15T11:36:36.864Z 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 cd8b39d..b6c89e7 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-10T15:25:24.216Z by adl.to-selmer-templates.
+<!-- File list-canvassers-Canvassers.html generated 2018-07-15T11:36:36.893Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-districts-Districts.html b/resources/templates/auto/list-districts-Districts.html
index 45f039e..91fdbb2 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-10T15:25:24.212Z by adl.to-selmer-templates.
+<!-- File list-districts-Districts.html generated 2018-07-15T11:36:36.888Z 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 5874acc..d59141b 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-10T15:25:24.206Z by adl.to-selmer-templates.
+<!-- File list-dwellings-Dwellings.html generated 2018-07-15T11:36:36.881Z 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 4d3db15..f27f382 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-10T15:25:24.197Z by adl.to-selmer-templates.
+<!-- File list-electors-Electors.html generated 2018-07-15T11:36:36.871Z 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 0b864e8..f38df97 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-10T15:25:24.212Z by adl.to-selmer-templates.
+<!-- File list-events-Events.html generated 2018-07-15T11:36:36.889Z 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 2c20687..ccbdf0b 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-10T15:25:24.215Z by adl.to-selmer-templates.
+<!-- File list-followupactions-Followupactions.html generated 2018-07-15T11:36:36.893Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-followupmethods-Followupmethods.html b/resources/templates/auto/list-followupmethods-Followupmethods.html
index c0bf1bf..ef84adf 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-10T15:25:24.201Z by adl.to-selmer-templates.
+<!-- File list-followupmethods-Followupmethods.html generated 2018-07-15T11:36:36.876Z 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 dacaf20..b34f5d9 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-10T15:25:24.192Z by adl.to-selmer-templates.
+<!-- File list-followuprequests-Followuprequests.html generated 2018-07-15T11:36:36.861Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-genders-Genders.html b/resources/templates/auto/list-genders-Genders.html
index a0566ce..ecab4e2 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-10T15:25:24.188Z by adl.to-selmer-templates.
+<!-- File list-genders-Genders.html generated 2018-07-15T11:36:36.857Z 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 e7a53cb..42e9fc2 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-10T15:25:24.217Z by adl.to-selmer-templates.
+<!-- File list-intentions-Intentions.html generated 2018-07-15T11:36:36.895Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/resources/templates/auto/list-issues-Issues.html b/resources/templates/auto/list-issues-Issues.html
index 7d6c584..5442129 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-10T15:25:24.213Z by adl.to-selmer-templates.
+<!-- File list-issues-Issues.html generated 2018-07-15T11:36:36.890Z 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 61776f2..b73b631 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-10T15:25:24.193Z by adl.to-selmer-templates.
+<!-- File list-options-Options.html generated 2018-07-15T11:36:36.862Z 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 e29e58f..df238f4 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-10T15:25:24.200Z by adl.to-selmer-templates.
+<!-- File list-roles-Roles.html generated 2018-07-15T11:36:36.875Z 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 d7a8317..4e0e2d8 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-10T15:25:24.190Z by adl.to-selmer-templates.
+<!-- File list-teams-Teams.html generated 2018-07-15T11:36:36.859Z 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 9a0c704..21b0e3c 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-10T15:25:24.189Z by adl.to-selmer-templates.
+<!-- File list-visits-Visits.html generated 2018-07-15T11:36:36.858Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 
 
diff --git a/src/clj/youyesyet/routes/auto.clj b/src/clj/youyesyet/routes/auto.clj
index a36d14b..6a0f93e 100644
--- a/src/clj/youyesyet/routes/auto.clj
+++ b/src/clj/youyesyet/routes/auto.clj
@@ -1,6 +1,6 @@
 (ns
  youyesyet.routes.auto
- "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180710T152523.603Z"
+ "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180715T113636.250Z"
  (:require
   [adl-support.core :as support]
   [clojure.java.io :as io]
diff --git a/src/clj/youyesyet/routes/auto_json.clj b/src/clj/youyesyet/routes/auto_json.clj
index b6a33eb..806144b 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 20180710T152522.387Z"
+ "JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180715T113634.964Z"
  (:require
   [adl-support.core :as support]
   [clojure.core.memoize :as memo]
diff --git a/src/cljs/youyesyet/canvasser_app/core.cljs b/src/cljs/youyesyet/canvasser_app/core.cljs
index 4044f05..6e76016 100644
--- a/src/cljs/youyesyet/canvasser_app/core.cljs
+++ b/src/cljs/youyesyet/canvasser_app/core.cljs
@@ -86,7 +86,6 @@
    :building #'building-page
    :dwelling #'dwelling-page
    :elector #'elector-page
-   :expert #'expert
    :followup #'followup-page
    :gdpr #'gdpr-page
    :issues #'issues-page
diff --git a/src/cljs/youyesyet/issue_expert_app/README.md b/src/cljs/youyesyet/issue_expert_app/README.md
deleted file mode 100644
index 15db07c..0000000
--- a/src/cljs/youyesyet/issue_expert_app/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Issue Expert app
-
-The Issue Expert app is essentially a whole different app. I think it needs to be an app because it needs a much more slick UI than an old CRUD web system, but it's designed for use on desktop systems with large screens.
-
-It comprises two views: a list of open followup requests, and a view to handle an individual request. The work flow is, pick a request from the list, obtain an exclusive lock on it,
diff --git a/src/cljs/youyesyet/issue_expert_app/core.cljs b/src/cljs/youyesyet/issue_expert_app/core.cljs
deleted file mode 100644
index e69de29..0000000
diff --git a/src/cljs/youyesyet/issue_expert_app/views/list.cljs b/src/cljs/youyesyet/issue_expert_app/views/list.cljs
deleted file mode 100644
index eddaf8c..0000000
--- a/src/cljs/youyesyet/issue_expert_app/views/list.cljs
+++ /dev/null
@@ -1,52 +0,0 @@
-(ns ^{:doc "Issue Expert app list panel."
-      :author "Simon Brooke"}
-  youyesyet.canvasser-app.views.issues
-  (:require [re-frame.core :refer [reg-sub subscribe]]
-            [youyesyet.canvasser-app.ui-utils :as ui]))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;
-;;;; youyesyet.canvasser-app.views.issues: working view for issue experts for youyesyet.
-;;;;
-;;;; This program is free software; you can redistribute it and/or
-;;;; modify it under the terms of the GNU General Public License
-;;;; as published by the Free Software Foundation; either version 2
-;;;; of the License, or (at your option) any later version.
-;;;;
-;;;; This program is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with this program; if not, write to the Free Software
-;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
-;;;; USA.
-;;;;
-;;;; Copyright (C) 2016 Simon Brooke for Radical Independence Campaign
-;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-;;; The pattern from the re-com demo (https://github.com/Day8/re-com) is to have
-;;; one source file/namespace per view. Each namespace contains a function 'panel'
-;;; whose output is an enlive-style specification of the view to be redered.
-;;; I propose to follow this pattern. This file will provide the issues view.
-
-
-;;; TODO: This is, in essence, an enturely different app. It really ought to be
-;;; in a separate project. But to get it working quickly, it's here for now.
-
-;;; Simple list of the issues of the day.
-(defn panel
-  "Generate the list panel."
-  []
-  (let [issues @(subscribe [:issues])]
-    (if issues
-      [:div
-       [:h1 "Issues"]
-       [:div.container {:id "main-container"}
-        (ui/back-link)
-        [:div {:id "issue-list"}
-         (map (fn [i] (ui/big-link (:id i) :target (str "#issue/" (:id i)))) issues)]]]
-      (ui/error-panel "No issues loaded"))))
diff --git a/youyesyet.adl.xml b/youyesyet.adl.xml
index 884879d..ee2123b 100644
--- a/youyesyet.adl.xml
+++ b/youyesyet.adl.xml
@@ -274,11 +274,11 @@ version="0.1.1">
       <field property="id">
         <prompt prompt="id" locale="en-GB"/>
       </field>
-      <field property="Address">
-        <prompt prompt="address" locale="en-GB"/>
+      <field property="address">
+        <prompt prompt="Address" locale="en-GB"/>
       </field>
-      <field property="Postcode">
-        <prompt prompt="postcode" locale="en-GB"/>
+      <field property="postcode">
+        <prompt prompt="Postcode" locale="en-GB"/>
       </field>
       <field property="phone">
         <prompt prompt="Phone" locale="en-GB"/>
diff --git a/youyesyet.canonical.adl.xml b/youyesyet.canonical.adl.xml
index 11e2031..eb1c12d 100644
--- a/youyesyet.canonical.adl.xml
+++ b/youyesyet.canonical.adl.xml
@@ -271,11 +271,11 @@
       <field property="id">
         <prompt prompt="id" locale="en-GB"/>
       </field>
-      <field property="Address">
-        <prompt prompt="address" locale="en-GB"/>
+      <field property="address">
+        <prompt prompt="Address" locale="en-GB"/>
       </field>
-      <field property="Postcode">
-        <prompt prompt="postcode" locale="en-GB"/>
+      <field property="postcode">
+        <prompt prompt="Postcode" locale="en-GB"/>
       </field>
       <field property="phone">
         <prompt prompt="Phone" locale="en-GB"/>