Merge branch 'ijackson'

diff --combined yarrg/web/query_route
index cfe03df4202d0d1db8fb6917f964b0ac229ae101,96e8c32d7621aac31cf83b4ffd4effbe97257ca5..ea483578d565d6df529dffcfddf7d1c6a5c1e9cf
--- 1/yarrg/web/query_route
--- 2/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@@ -94,7 -94,7 +94,7 @@@ Enter route (islands, or archipelagoes
  <tr>
  <td>
  
- Vessel capacity:
+ Vessel or capacity:
  <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'cs',
      thingstring => 'capacitystring', emsgstore => \$emsg,
      perresult => sub {
@@@ -109,7 -109,7 +109,7 @@@
  &nbsp;
  
  <td>
 -Estimated loss per league:
 +Expected losses:
  
  <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll',
      thingstring => 'lossperleague', emsgstore => \$emsg,