diff --git a/env/dev/clj/youyesyet/dev_middleware.clj b/env/dev/clj/youyesyet/dev_middleware.clj
index d64d5d5..e3881c8 100644
--- a/env/dev/clj/youyesyet/dev_middleware.clj
+++ b/env/dev/clj/youyesyet/dev_middleware.clj
@@ -1,10 +1,13 @@
 (ns youyesyet.dev-middleware
-  (:require [ring.middleware.reload :refer [wrap-reload]]
+  (:require
+;;    [ring.middleware.reload :refer [wrap-reload]]
             [selmer.middleware :refer [wrap-error-page]]
-            [prone.middleware :refer [wrap-exceptions]]))
+            [prone.middleware :refer [wrap-exceptions]]
+  ))
 
 (defn wrap-dev [handler]
-  (-> handler
-      wrap-reload
-      wrap-error-page
-      wrap-exceptions))
+   (-> handler
+;;       wrap-reload
+       wrap-error-page
+       wrap-exceptions
+       ))
diff --git a/env/dev/clj/youyesyet/env.clj b/env/dev/clj/youyesyet/env.clj
index 87bfa55..ef35fd0 100644
--- a/env/dev/clj/youyesyet/env.clj
+++ b/env/dev/clj/youyesyet/env.clj
@@ -1,7 +1,8 @@
 (ns youyesyet.env
   (:require [selmer.parser :as parser]
             [clojure.tools.logging :as log]
-            [youyesyet.dev-middleware :refer [wrap-dev]]))
+            [youyesyet.dev-middleware :refer [wrap-dev]]
+            ))
 
 (def defaults
   {:init
@@ -11,4 +12,5 @@
    :stop
    (fn []
      (log/info "\n-=[youyesyet has shut down successfully]=-"))
-   :middleware wrap-dev})
+   :middleware wrap-dev
+   })
diff --git a/resources/sql/queries.auto.sql b/resources/sql/queries.auto.sql
index 9de72ba..0f482c4 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-06-19T18:51:50.013Z 
+--	autogenerated by adl.to-hugsql-queries at 2018-06-29T10:10:58.177Z 
 --	
 --	See [Application Description 
 --	Language](https://github.com/simon-brooke/adl). 
@@ -728,15 +728,15 @@ ORDER BY lv_visits.address_id,
 -- :name search-strings-address :? :1
 -- :doc selects existing address records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_addresses
-WHERE 
-address LIKE '%params.address%'
-	OR postcode = params.postcode
-	OR phone LIKE '%params.phone%'
-	OR district_id = params.district_id
-	OR latitude = params.latitude
-	OR longitude = params.longitude
-	OR locality = params.locality
-	OR id = params.id
+WHERE false
+	--~ (if (:address params) "OR address LIKE '%:address%'")
+	--~ (if (:postcode params) "OR postcode LIKE '%:postcode%'")
+	--~ (if (:phone params) "OR phone LIKE '%:phone%'")
+	--~ (if (:district_id params) "OR district_id = :district_id")
+	--~ (if (:latitude params) "OR latitude = :latitude")
+	--~ (if (:longitude params) "OR longitude = :longitude")
+	--~ (if (:locality params) "OR locality = :locality")
+	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_addresses.address,
 	lv_addresses.postcode,
 	lv_addresses.id
@@ -746,24 +746,24 @@ ORDER BY lv_addresses.address,
 -- :name search-strings-authority :? :1
 -- :doc selects existing authority records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_authorities
-WHERE 
-id LIKE '%params.id%'
+WHERE false
+	--~ (if (:id params) "OR id LIKE '%:id%'")
 --~ (if (:offset params) "OFFSET :offset ")
 --~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
 
 -- :name search-strings-canvasser :? :1
 -- :doc selects existing canvasser records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_canvassers
-WHERE 
-username LIKE '%params.username%'
-	OR fullname LIKE '%params.fullname%'
-	OR elector_id = params.elector_id
-	OR address_id = params.address_id
-	OR phone LIKE '%params.phone%'
-	OR email LIKE '%params.email%'
-	OR authority_id = params.authority_id
-	OR authorised = params.authorised
-	OR id = params.id
+WHERE false
+	--~ (if (:username params) "OR username LIKE '%:username%'")
+	--~ (if (:fullname params) "OR fullname LIKE '%:fullname%'")
+	--~ (if (:elector_id params) "OR elector_id = :elector_id")
+	--~ (if (:address_id params) "OR address_id = :address_id")
+	--~ (if (:phone params) "OR phone LIKE '%:phone%'")
+	--~ (if (:email params) "OR email LIKE '%:email%'")
+	--~ (if (:authority_id params) "OR authority_id = :authority_id")
+	--~ (if (:authorised params) "OR authorised = :authorised")
+	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_canvassers.username,
 	lv_canvassers.fullname,
 	lv_canvassers.email,
@@ -774,9 +774,9 @@ ORDER BY lv_canvassers.username,
 -- :name search-strings-district :? :1
 -- :doc selects existing district records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_districts
-WHERE 
-name LIKE '%params.name%'
-	OR id = params.id
+WHERE false
+	--~ (if (:name params) "OR name LIKE '%:name%'")
+	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_districts.name,
 	lv_districts.id
 --~ (if (:offset params) "OFFSET :offset ")
@@ -785,10 +785,10 @@ ORDER BY lv_districts.name,
 -- :name search-strings-dwelling :? :1
 -- :doc selects existing dwelling records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_dwellings
-WHERE 
-address_id = params.address_id
-	OR sub_address LIKE '%params.sub-address%'
-	OR id = params.id
+WHERE false
+	--~ (if (:address_id params) "OR address_id = :address_id")
+	--~ (if (:sub-address params) "OR sub_address LIKE '%:sub-address%'")
+	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_dwellings.address_id,
 	lv_dwellings.sub_address,
 	lv_dwellings.id
@@ -798,13 +798,13 @@ ORDER BY lv_dwellings.address_id,
 -- :name search-strings-elector :? :1
 -- :doc selects existing elector records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_electors
-WHERE 
-name LIKE '%params.name%'
-	OR dwelling_id = params.dwelling_id
-	OR phone LIKE '%params.phone%'
-	OR email LIKE '%params.email%'
-	OR gender = params.gender
-	OR id = params.id
+WHERE false
+	--~ (if (:name params) "OR name LIKE '%:name%'")
+	--~ (if (:dwelling_id params) "OR dwelling_id = :dwelling_id")
+	--~ (if (:phone params) "OR phone LIKE '%:phone%'")
+	--~ (if (:email params) "OR email LIKE '%:email%'")
+	--~ (if (:gender params) "OR gender = :gender")
+	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_electors.name,
 	lv_electors.phone,
 	lv_electors.email,
@@ -816,13 +816,13 @@ ORDER BY lv_electors.name,
 -- :name search-strings-followupaction :? :1
 -- :doc selects existing followupaction records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_followupactions
-WHERE 
-request_id = params.request_id
-	OR actor = params.actor
-	OR date = 'params.date'
-	OR notes LIKE '%params.notes%'
-	OR closed = params.closed
-	OR id = params.id
+WHERE false
+	--~ (if (:request_id params) "OR request_id = :request_id")
+	--~ (if (:actor params) "OR actor = :actor")
+	--~ (if (:date params) "OR date = ':date'")
+	--~ (if (:notes params) "OR notes LIKE '%:notes%'")
+	--~ (if (:closed params) "OR closed = :closed")
+	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_followupactions.date,
 	lv_followupactions.notes,
 	lv_followupactions.id
@@ -832,20 +832,20 @@ ORDER BY lv_followupactions.date,
 -- :name search-strings-followupmethod :? :1
 -- :doc selects existing followupmethod records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_followupmethods
-WHERE 
-id LIKE '%params.id%'
+WHERE false
+	--~ (if (:id params) "OR id LIKE '%:id%'")
 --~ (if (:offset params) "OFFSET :offset ")
 --~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
 
 -- :name search-strings-followuprequest :? :1
 -- :doc selects existing followuprequest records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_followuprequests
-WHERE 
-elector_id = params.elector_id
-	OR visit_id = params.visit_id
-	OR issue_id = params.issue_id
-	OR method_id = params.method_id
-	OR id = params.id
+WHERE false
+	--~ (if (:elector_id params) "OR elector_id = :elector_id")
+	--~ (if (:visit_id params) "OR visit_id = :visit_id")
+	--~ (if (:issue_id params) "OR issue_id = :issue_id")
+	--~ (if (:method_id params) "OR method_id = :method_id")
+	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_followuprequests.elector_id,
 	lv_followuprequests.visit_id,
 	lv_followuprequests.issue_id,
@@ -856,46 +856,46 @@ ORDER BY lv_followuprequests.elector_id,
 -- :name search-strings-gender :? :1
 -- :doc selects existing gender records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_genders
-WHERE 
-id LIKE '%params.id%'
+WHERE false
+	--~ (if (:id params) "OR id LIKE '%:id%'")
 --~ (if (:offset params) "OFFSET :offset ")
 --~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
 
 -- :name search-strings-intention :? :1
 -- :doc selects existing intention records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_intentions
-WHERE 
-visit_id = params.visit_id
-	OR elector_id = params.elector_id
-	OR option_id = params.option_id
-	OR Id = params.Id
+WHERE false
+	--~ (if (:visit_id params) "OR visit_id = :visit_id")
+	--~ (if (:elector_id params) "OR elector_id = :elector_id")
+	--~ (if (:option_id params) "OR option_id = :option_id")
+	--~ (if (:Id params) "OR Id = :Id")
 --~ (if (:offset params) "OFFSET :offset ")
 --~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
 
 -- :name search-strings-issue :? :1
 -- :doc selects existing issue records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_issues
-WHERE 
-url LIKE '%params.url%'
-	OR current = params.current
-	OR id LIKE '%params.id%'
+WHERE false
+	--~ (if (:url params) "OR url LIKE '%:url%'")
+	--~ (if (:current params) "OR current = :current")
+	--~ (if (:id params) "OR id LIKE '%:id%'")
 --~ (if (:offset params) "OFFSET :offset ")
 --~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
 
 -- :name search-strings-option :? :1
 -- :doc selects existing option records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_options
-WHERE 
-id LIKE '%params.id%'
+WHERE false
+	--~ (if (:id params) "OR id LIKE '%:id%'")
 --~ (if (:offset params) "OFFSET :offset ")
 --~ (if (:limit params) "LIMIT :limit" "LIMIT 100")
 
 -- :name search-strings-role :? :1
 -- :doc selects existing role records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_roles
-WHERE 
-name LIKE '%params.name%'
-	OR id = params.id
+WHERE false
+	--~ (if (:name params) "OR name LIKE '%:name%'")
+	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_roles.name,
 	lv_roles.id
 --~ (if (:offset params) "OFFSET :offset ")
@@ -904,12 +904,12 @@ ORDER BY lv_roles.name,
 -- :name search-strings-team :? :1
 -- :doc selects existing team records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_teams
-WHERE 
-name LIKE '%params.name%'
-	OR district_id = params.district_id
-	OR latitude = params.latitude
-	OR longitude = params.longitude
-	OR id = params.id
+WHERE false
+	--~ (if (:name params) "OR name LIKE '%:name%'")
+	--~ (if (:district_id params) "OR district_id = :district_id")
+	--~ (if (:latitude params) "OR latitude = :latitude")
+	--~ (if (:longitude params) "OR longitude = :longitude")
+	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_teams.name,
 	lv_teams.id
 --~ (if (:offset params) "OFFSET :offset ")
@@ -918,11 +918,11 @@ ORDER BY lv_teams.name,
 -- :name search-strings-visit :? :1
 -- :doc selects existing visit records having any string field matching the parameter of the same name by substring match
 SELECT * FROM lv_visits
-WHERE 
-address_id = params.address_id
-	OR canvasser_id = params.canvasser_id
-	OR date = 'params.date'
-	OR id = params.id
+WHERE false
+	--~ (if (:address_id params) "OR address_id = :address_id")
+	--~ (if (:canvasser_id params) "OR canvasser_id = :canvasser_id")
+	--~ (if (:date params) "OR date = ':date'")
+	--~ (if (:id params) "OR id = :id")
 ORDER BY lv_visits.address_id,
 	lv_visits.date,
 	lv_visits.id
diff --git a/resources/sql/youyesyet.postgres.sql b/resources/sql/youyesyet.postgres.sql
index 6ca584c..1bc4b7d 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 20180619T185151.055Z 
+--	(https://github.com/simon-brooke/adl) at 20180629T101059.126Z 
 --	
 --	
 --	    A web-app intended to be used by canvassers campaigning for a 
diff --git a/resources/templates/auto/application-index.html b/resources/templates/auto/application-index.html
index b1c7666..1edf694 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-06-19T18:51:51.700Z by adl.to-selmer-templates.
+<!-- File application-index.html generated 2018-06-29T10:10:59.615Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-addresses-Address.html b/resources/templates/auto/form-addresses-Address.html
index ac19037..a6d8011 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-06-19T18:51:51.676Z by adl.to-selmer-templates.
+<!-- File form-addresses-Address.html generated 2018-06-29T10:10:59.603Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
@@ -47,7 +47,7 @@ You are not permitted to view id of addresses
 address
 </label>
 {% ifmemberof admin %}
-<input id='address' name='address' type='text' value='{{record.address}}'/>
+<input id='address' name='address' type='text' value='{{record.address}}' maxlength='256' size='60'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='address' name='address' class='pseudo-widget disabled'>
@@ -65,7 +65,7 @@ You are not permitted to view address of addresses
 postcode
 </label>
 {% ifmemberof admin %}
-<input id='postcode' name='postcode' type='text' value='{{record.postcode}}'/>
+<input id='postcode' name='postcode' type='text' value='{{record.postcode}}' maxlength='16' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='postcode' name='postcode' class='pseudo-widget disabled'>
@@ -83,7 +83,7 @@ You are not permitted to view postcode of addresses
 phone
 </label>
 {% ifmemberof admin %}
-<input id='phone' name='phone' type='text' value='{{record.phone}}'/>
+<input id='phone' name='phone' type='text' value='{{record.phone}}' maxlength='16' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='phone' name='phone' class='pseudo-widget disabled'>
@@ -124,7 +124,7 @@ You are not permitted to view district_id of addresses
 latitude
 </label>
 {% ifmemberof admin %}
-<input id='latitude' name='latitude' type='number' value='{{record.latitude}}'/>
+<input id='latitude' name='latitude' type='number' value='{{record.latitude}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='latitude' name='latitude' class='pseudo-widget disabled'>
@@ -142,7 +142,7 @@ You are not permitted to view latitude of addresses
 longitude
 </label>
 {% ifmemberof admin %}
-<input id='longitude' name='longitude' type='number' value='{{record.longitude}}'/>
+<input id='longitude' name='longitude' type='number' value='{{record.longitude}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='longitude' name='longitude' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-authorities-Authority.html b/resources/templates/auto/form-authorities-Authority.html
index ba66240..6b4756b 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-06-19T18:51:51.716Z by adl.to-selmer-templates.
+<!-- File form-authorities-Authority.html generated 2018-06-29T10:10:59.623Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-canvassers-Canvasser.html b/resources/templates/auto/form-canvassers-Canvasser.html
index 8ca174a..baa9afa 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-06-19T18:51:51.720Z by adl.to-selmer-templates.
+<!-- File form-canvassers-Canvasser.html generated 2018-06-29T10:10:59.624Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
@@ -47,7 +47,7 @@ You are not permitted to view id of canvassers
 username
 </label>
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<input id='username' name='username' type='text' value='{{record.username}}'/>
+<input id='username' name='username' type='text' value='{{record.username}}' maxlength='32' size='32'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='username' name='username' class='pseudo-widget disabled'>
@@ -65,7 +65,7 @@ You are not permitted to view username of canvassers
 fullname
 </label>
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<input id='fullname' name='fullname' type='text' value='{{record.fullname}}'/>
+<input id='fullname' name='fullname' type='text' value='{{record.fullname}}' maxlength='64' size='60'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='fullname' name='fullname' class='pseudo-widget disabled'>
@@ -129,7 +129,7 @@ You are not permitted to view address_id of canvassers
 phone
 </label>
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<input id='phone' name='phone' type='text' value='{{record.phone}}'/>
+<input id='phone' name='phone' type='text' value='{{record.phone}}' maxlength='16' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='phone' name='phone' class='pseudo-widget disabled'>
@@ -147,7 +147,7 @@ You are not permitted to view phone of canvassers
 email
 </label>
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<input id='email' name='email' type='text' value='{{record.email}}'/>
+<input id='email' name='email' type='text' value='{{record.email}}' maxlength='128' size='60'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='email' name='email' class='pseudo-widget disabled'>
@@ -188,7 +188,7 @@ You are not permitted to view authority_id of canvassers
 authorised
 </label>
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers admin %}
-<input id='authorised' name='authorised' type='checkbox' value='{{record.authorised}}'/>
+<input id='authorised' name='authorised' type='checkbox' value='{{record.authorised}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='authorised' name='authorised' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-districts-District.html b/resources/templates/auto/form-districts-District.html
index 7ca8ef3..75a5ca2 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-06-19T18:51:51.662Z by adl.to-selmer-templates.
+<!-- File form-districts-District.html generated 2018-06-29T10:10:59.594Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof public admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
@@ -47,7 +47,7 @@ You are not permitted to view id of districts
 name
 </label>
 {% ifmemberof admin admin %}
-<input id='name' name='name' type='text' value='{{record.name}}'/>
+<input id='name' name='name' type='text' value='{{record.name}}' maxlength='64' size='60'/>
 {% else %}
 {% ifmemberof public admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='name' name='name' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-dwellings-Dwelling.html b/resources/templates/auto/form-dwellings-Dwelling.html
index 4df6725..9fce23f 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-06-19T18:51:51.739Z by adl.to-selmer-templates.
+<!-- File form-dwellings-Dwelling.html generated 2018-06-29T10:10:59.636Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
@@ -70,7 +70,7 @@ You are not permitted to view address_id of dwellings
 sub-address
 </label>
 {% ifmemberof admin %}
-<input id='sub-address' name='sub-address' type='text' value='{{record.sub-address}}'/>
+<input id='sub-address' name='sub-address' type='text' value='{{record.sub-address}}' maxlength='32' size='32'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='sub-address' name='sub-address' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-electors-Elector.html b/resources/templates/auto/form-electors-Elector.html
index 6ebac98..63c2281 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-06-19T18:51:51.709Z by adl.to-selmer-templates.
+<!-- File form-electors-Elector.html generated 2018-06-29T10:10:59.619Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
@@ -47,7 +47,7 @@ You are not permitted to view id of electors
 name
 </label>
 {% ifmemberof admin %}
-<input id='name' name='name' type='text' value='{{record.name}}'/>
+<input id='name' name='name' type='text' value='{{record.name}}' maxlength='64' size='60'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='name' name='name' class='pseudo-widget disabled'>
@@ -88,7 +88,7 @@ You are not permitted to view dwelling_id of electors
 phone
 </label>
 {% ifmemberof admin %}
-<input id='phone' name='phone' type='text' value='{{record.phone}}'/>
+<input id='phone' name='phone' type='text' value='{{record.phone}}' maxlength='16' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='phone' name='phone' class='pseudo-widget disabled'>
@@ -106,7 +106,7 @@ You are not permitted to view phone of electors
 email
 </label>
 {% ifmemberof admin %}
-<input id='email' name='email' type='text' value='{{record.email}}'/>
+<input id='email' name='email' type='text' value='{{record.email}}' maxlength='128' size='60'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='email' name='email' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-followupactions-Followupaction.html b/resources/templates/auto/form-followupactions-Followupaction.html
index 1e41b25..5e2c3a2 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-06-19T18:51:51.743Z by adl.to-selmer-templates.
+<!-- File form-followupactions-Followupaction.html generated 2018-06-29T10:10:59.639Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
@@ -93,7 +93,7 @@ You are not permitted to view actor of followupactions
 date
 </label>
 {% ifmemberof admin %}
-<input id='date' name='date' type='text' value='{{record.date}}'/>
+<input id='date' name='date' type='text' value='{{record.date}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
 <span id='date' name='date' class='pseudo-widget disabled'>
@@ -111,7 +111,7 @@ You are not permitted to view date of followupactions
 notes
 </label>
 {% ifmemberof admin %}
-<input id='notes' name='notes' type='text' value='{{record.notes}}'/>
+<input id='notes' name='notes' type='text' value='{{record.notes}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
 <span id='notes' name='notes' class='pseudo-widget disabled'>
@@ -129,7 +129,7 @@ You are not permitted to view notes of followupactions
 closed
 </label>
 {% ifmemberof admin %}
-<input id='closed' name='closed' type='checkbox' value='{{record.closed}}'/>
+<input id='closed' name='closed' type='checkbox' value='{{record.closed}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof issueexperts canvassers analysts issueeditors admin %}
 <span id='closed' name='closed' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-followupmethods-Followupmethod.html b/resources/templates/auto/form-followupmethods-Followupmethod.html
index 7e2eb2e..990d86a 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-06-19T18:51:51.746Z by adl.to-selmer-templates.
+<!-- File form-followupmethods-Followupmethod.html generated 2018-06-29T10:10:59.641Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-followuprequests-Followuprequest.html b/resources/templates/auto/form-followuprequests-Followuprequest.html
index 0edcbf9..e728eaa 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-06-19T18:51:51.667Z by adl.to-selmer-templates.
+<!-- File form-followuprequests-Followuprequest.html generated 2018-06-29T10:10:59.598Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-genders-Gender.html b/resources/templates/auto/form-genders-Gender.html
index 7113f50..75f2d8c 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-06-19T18:51:51.652Z by adl.to-selmer-templates.
+<!-- File form-genders-Gender.html generated 2018-06-29T10:10:59.589Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-intentions-Intention.html b/resources/templates/auto/form-intentions-Intention.html
index 084901d..5092d37 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-06-19T18:51:51.734Z by adl.to-selmer-templates.
+<!-- File form-intentions-Intention.html generated 2018-06-29T10:10:59.632Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/form-issues-Issue.html b/resources/templates/auto/form-issues-Issue.html
index 682ea18..2b84f42 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-06-19T18:51:51.684Z by adl.to-selmer-templates.
+<!-- File form-issues-Issue.html generated 2018-06-29T10:10:59.607Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof issueeditors admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
@@ -47,7 +47,7 @@ You are not permitted to view id of issues
 url
 </label>
 {% ifmemberof issueeditors admin %}
-<input id='url' name='url' type='text' value='{{record.url}}'/>
+<input id='url' name='url' type='text' value='{{record.url}}' maxlength='256' size='60'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='url' name='url' class='pseudo-widget disabled'>
@@ -65,7 +65,7 @@ You are not permitted to view url of issues
 current
 </label>
 {% ifmemberof issueeditors admin %}
-<input id='current' name='current' type='checkbox' value='{{record.current}}'/>
+<input id='current' name='current' type='checkbox' value='{{record.current}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='current' name='current' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-options-Option.html b/resources/templates/auto/form-options-Option.html
index 90bc5ad..f59aa32 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-06-19T18:51:51.733Z by adl.to-selmer-templates.
+<!-- File form-options-Option.html generated 2018-06-29T10:10:59.631Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-roles-Role.html b/resources/templates/auto/form-roles-Role.html
index 2a8b4d8..5f71430 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-06-19T18:51:51.687Z by adl.to-selmer-templates.
+<!-- File form-roles-Role.html generated 2018-06-29T10:10:59.609Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
@@ -47,7 +47,7 @@ You are not permitted to view id of roles
 name
 </label>
 {% ifmemberof admin %}
-<input id='name' name='name' type='text' value='{{record.name}}'/>
+<input id='name' name='name' type='text' value='{{record.name}}' maxlength='64' size='60'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='name' name='name' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-teams-Team.html b/resources/templates/auto/form-teams-Team.html
index af9e574..0a0d09d 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-06-19T18:51:51.702Z by adl.to-selmer-templates.
+<!-- File form-teams-Team.html generated 2018-06-29T10:10:59.616Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof teamorganisers admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
@@ -47,7 +47,7 @@ You are not permitted to view id of teams
 name
 </label>
 {% ifmemberof teamorganisers admin %}
-<input id='name' name='name' type='text' value='{{record.name}}'/>
+<input id='name' name='name' type='text' value='{{record.name}}' maxlength='64' size='60'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='name' name='name' class='pseudo-widget disabled'>
@@ -88,7 +88,7 @@ You are not permitted to view district_id of teams
 latitude
 </label>
 {% ifmemberof teamorganisers admin %}
-<input id='latitude' name='latitude' type='number' value='{{record.latitude}}'/>
+<input id='latitude' name='latitude' type='number' value='{{record.latitude}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='latitude' name='latitude' class='pseudo-widget disabled'>
@@ -152,7 +152,7 @@ You are not permitted to view organisers of teams
 longitude
 </label>
 {% ifmemberof teamorganisers admin %}
-<input id='longitude' name='longitude' type='number' value='{{record.longitude}}'/>
+<input id='longitude' name='longitude' type='number' value='{{record.longitude}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='longitude' name='longitude' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/form-visits-Visit.html b/resources/templates/auto/form-visits-Visit.html
index 1804624..e07cca1 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-06-19T18:51:51.695Z by adl.to-selmer-templates.
+<!-- File form-visits-Visit.html generated 2018-06-29T10:10:59.613Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
@@ -29,7 +29,7 @@ See [Application Description Language](https://github.com/simon-brooke/adl).-->
 id
 </label>
 {% ifmemberof admin admin %}
-<input id='id' name='id' type='text' value='{{record.id}}'/>
+<input id='id' name='id' type='text' value='{{record.id}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='id' name='id' class='pseudo-widget disabled'>
@@ -93,7 +93,7 @@ You are not permitted to view canvasser_id of visits
 date
 </label>
 {% ifmemberof admin admin %}
-<input id='date' name='date' type='text' value='{{record.date}}'/>
+<input id='date' name='date' type='text' value='{{record.date}}' maxlength='' size='16'/>
 {% else %}
 {% ifmemberof canvassers teamorganisers issueexperts analysts issueeditors admin canvassers teamorganisers issueexperts analysts issueeditors admin %}
 <span id='date' name='date' class='pseudo-widget disabled'>
diff --git a/resources/templates/auto/list-addresses-Addresses.html b/resources/templates/auto/list-addresses-Addresses.html
index 2d6d337..829be5b 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-06-19T18:51:51.718Z by adl.to-selmer-templates.
+<!-- File list-addresses-Addresses.html generated 2018-06-29T10:10:59.623Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-authorities-Authorities.html b/resources/templates/auto/list-authorities-Authorities.html
index 3271ca8..d20fe9d 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-06-19T18:51:51.665Z by adl.to-selmer-templates.
+<!-- File list-authorities-Authorities.html generated 2018-06-29T10:10:59.597Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-canvassers-Canvassers.html b/resources/templates/auto/list-canvassers-Canvassers.html
index 01549e9..c9719e0 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-06-19T18:51:51.737Z by adl.to-selmer-templates.
+<!-- File list-canvassers-Canvassers.html generated 2018-06-29T10:10:59.635Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-districts-Districts.html b/resources/templates/auto/list-districts-Districts.html
index e25f1f2..982e2d4 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-06-19T18:51:51.729Z by adl.to-selmer-templates.
+<!-- File list-districts-Districts.html generated 2018-06-29T10:10:59.629Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-dwellings-Dwellings.html b/resources/templates/auto/list-dwellings-Dwellings.html
index aad96d1..4d633ca 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-06-19T18:51:51.714Z by adl.to-selmer-templates.
+<!-- File list-dwellings-Dwellings.html generated 2018-06-29T10:10:59.622Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-electors-Electors.html b/resources/templates/auto/list-electors-Electors.html
index 0c4ebb3..383fce7 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-06-19T18:51:51.682Z by adl.to-selmer-templates.
+<!-- File list-electors-Electors.html generated 2018-06-29T10:10:59.606Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-followupactions-Followupactions.html b/resources/templates/auto/list-followupactions-Followupactions.html
index bba3be3..26697ec 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-06-19T18:51:51.736Z by adl.to-selmer-templates.
+<!-- File list-followupactions-Followupactions.html generated 2018-06-29T10:10:59.634Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-followupmethods-Followupmethods.html b/resources/templates/auto/list-followupmethods-Followupmethods.html
index 3949d0b..74c7b37 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-06-19T18:51:51.693Z by adl.to-selmer-templates.
+<!-- File list-followupmethods-Followupmethods.html generated 2018-06-29T10:10:59.612Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-followuprequests-Followuprequests.html b/resources/templates/auto/list-followuprequests-Followuprequests.html
index 4889980..55a4b48 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-06-19T18:51:51.657Z by adl.to-selmer-templates.
+<!-- File list-followuprequests-Followuprequests.html generated 2018-06-29T10:10:59.592Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-genders-Genders.html b/resources/templates/auto/list-genders-Genders.html
index ebc8cf6..8ce6cc1 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-06-19T18:51:51.642Z by adl.to-selmer-templates.
+<!-- File list-genders-Genders.html generated 2018-06-29T10:10:59.584Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-intentions-Intentions.html b/resources/templates/auto/list-intentions-Intentions.html
index fb8d0d6..c90c0c9 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-06-19T18:51:51.741Z by adl.to-selmer-templates.
+<!-- File list-intentions-Intentions.html generated 2018-06-29T10:10:59.638Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-issues-Issues.html b/resources/templates/auto/list-issues-Issues.html
index ccab390..622cbae 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-06-19T18:51:51.731Z by adl.to-selmer-templates.
+<!-- File list-issues-Issues.html generated 2018-06-29T10:10:59.630Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-options-Options.html b/resources/templates/auto/list-options-Options.html
index ed3dac1..bb735be 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-06-19T18:51:51.660Z by adl.to-selmer-templates.
+<!-- File list-options-Options.html generated 2018-06-29T10:10:59.593Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-roles-Roles.html b/resources/templates/auto/list-roles-Roles.html
index abe6b54..76cdc21 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-06-19T18:51:51.691Z by adl.to-selmer-templates.
+<!-- File list-roles-Roles.html generated 2018-06-29T10:10:59.611Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-teams-Teams.html b/resources/templates/auto/list-teams-Teams.html
index 64a7f4a..613cff7 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-06-19T18:51:51.649Z by adl.to-selmer-templates.
+<!-- File list-teams-Teams.html generated 2018-06-29T10:10:59.588Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/resources/templates/auto/list-visits-Visits.html b/resources/templates/auto/list-visits-Visits.html
index 9101021..f37ba72 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-06-19T18:51:51.646Z by adl.to-selmer-templates.
+<!-- File list-visits-Visits.html generated 2018-06-29T10:10:59.586Z by adl.to-selmer-templates.
 See [Application Description Language](https://github.com/simon-brooke/adl).-->
 {% block head %}
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/>
diff --git a/src/clj/youyesyet/handler.clj b/src/clj/youyesyet/handler.clj
index 909dea4..8361e69 100644
--- a/src/clj/youyesyet/handler.clj
+++ b/src/clj/youyesyet/handler.clj
@@ -81,5 +81,4 @@
                      :title "page not found"})))))
 
 
-(def app #'app-routes)
-;;  (middleware/wrap-base #'app-routes))
+(def app (middleware/wrap-base #'app-routes))
diff --git a/src/clj/youyesyet/routes/auto.clj b/src/clj/youyesyet/routes/auto.clj
index e881916..50f81f8 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 20180619T185151.309Z"
+ "User interface routes for Youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180629T101059.328Z"
  (:require
   [adl-support.core :as support]
   [clojure.java.io :as io]
@@ -14,7 +14,7 @@
   [youyesyet.routes.manual :as m]))
 
 (defn
- admin
+ index
  [r]
  (l/render
   (support/resolve-template "application-index.html")
@@ -24,8 +24,7 @@
  list-addresses-Addresses
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-addresses-Addresses.html")
    {:title "Addresses",
@@ -40,8 +39,7 @@
  form-addresses-Address
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-addresses-Address.html")
    {:title "Address",
@@ -54,8 +52,7 @@
  list-authorities-Authorities
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-authorities-Authorities.html")
    {:title "Authorities",
@@ -70,8 +67,7 @@
  form-authorities-Authority
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-authorities-Authority.html")
    {:title "Authority",
@@ -86,8 +82,7 @@
  list-canvassers-Canvassers
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-canvassers-Canvassers.html")
    {:title "Canvassers",
@@ -102,8 +97,7 @@
  form-canvassers-Canvasser
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-canvassers-Canvasser.html")
    {:title "Canvasser",
@@ -121,8 +115,7 @@
  list-districts-Districts
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-districts-Districts.html")
    {:title "Districts",
@@ -137,8 +130,7 @@
  form-districts-District
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-districts-District.html")
    {:title "District",
@@ -153,8 +145,7 @@
  list-dwellings-Dwellings
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-dwellings-Dwellings.html")
    {:title "Dwellings",
@@ -169,8 +160,7 @@
  form-dwellings-Dwelling
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-dwellings-Dwelling.html")
    {:title "Dwelling",
@@ -186,8 +176,7 @@
  list-electors-Electors
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-electors-Electors.html")
    {:title "Electors",
@@ -202,8 +191,7 @@
  form-electors-Elector
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-electors-Elector.html")
    {:title "Elector",
@@ -217,8 +205,7 @@
  list-followupactions-Followupactions
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template
     "list-followupactions-Followupactions.html")
@@ -234,8 +221,7 @@
  form-followupactions-Followupaction
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template
     "form-followupactions-Followupaction.html")
@@ -253,8 +239,7 @@
  list-followupmethods-Followupmethods
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template
     "list-followupmethods-Followupmethods.html")
@@ -270,8 +255,7 @@
  form-followupmethods-Followupmethod
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template
     "form-followupmethods-Followupmethod.html")
@@ -287,8 +271,7 @@
  list-followuprequests-Followuprequests
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template
     "list-followuprequests-Followuprequests.html")
@@ -304,8 +287,7 @@
  form-followuprequests-Followuprequest
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template
     "form-followuprequests-Followuprequest.html")
@@ -325,8 +307,7 @@
  list-genders-Genders
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-genders-Genders.html")
    {:title "Genders",
@@ -341,8 +322,7 @@
  form-genders-Gender
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-genders-Gender.html")
    {:title "Gender",
@@ -357,8 +337,7 @@
  list-intentions-Intentions
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-intentions-Intentions.html")
    {:title "Intentions",
@@ -373,8 +352,7 @@
  form-intentions-Intention
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-intentions-Intention.html")
    {:title "Intention",
@@ -392,8 +370,7 @@
  list-issues-Issues
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-issues-Issues.html")
    {:title "Issues",
@@ -408,8 +385,7 @@
  form-issues-Issue
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-issues-Issue.html")
    {:title "Issue",
@@ -421,8 +397,7 @@
  list-options-Options
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-options-Options.html")
    {:title "Options",
@@ -437,8 +412,7 @@
  form-options-Option
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-options-Option.html")
    {:title "Option",
@@ -453,8 +427,7 @@
  list-roles-Roles
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-roles-Roles.html")
    {:title "Roles",
@@ -469,8 +442,7 @@
  form-roles-Role
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-roles-Role.html")
    {:title "Role",
@@ -482,8 +454,7 @@
  list-teams-Teams
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-teams-Teams.html")
    {:title "Teams",
@@ -498,8 +469,7 @@
  form-teams-Team
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-teams-Team.html")
    {:title "Team",
@@ -512,8 +482,7 @@
  list-visits-Visits
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "list-visits-Visits.html")
    {:title "Visits",
@@ -528,8 +497,7 @@
  form-visits-Visit
  [r]
  (let
-  [p
-   (merge (support/query-string-to-map (:query-string r)) (:params r))]
+  [p (support/massage-params (:params r))]
   (l/render
    (support/resolve-template "form-visits-Visit.html")
    {:title "Visit",
diff --git a/src/clj/youyesyet/routes/auto_json.clj b/src/clj/youyesyet/routes/auto_json.clj
index 42ea3a3..81a300d 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 20180619T185150.149Z"
+ "JSON routes for youyesyet auto-generated by [Application Description Language framework](https://github.com/simon-brooke/adl) at 20180629T101058.294Z"
  (:require
   [adl-support.core :as support]
   [clojure.java.io :as io]