diff --git a/css/report-filters.css b/css/report-filters.css
index 91fcff25..98c950b0 100644
--- a/css/report-filters.css
+++ b/css/report-filters.css
@@ -22,7 +22,7 @@
   padding-right: 24px;
   box-sizing:border-box;
   -moz-box-sizing:border-box;
-  -webkit-box-sizing:border-box
+  -webkit-box-sizing:border-box;
   height: auto;
 }
 
diff --git a/css/theme-bootstrap-3.css b/css/theme-bootstrap-3.css
index 99d20ab5..1c9b952f 100644
--- a/css/theme-bootstrap-3.css
+++ b/css/theme-bootstrap-3.css
@@ -270,6 +270,40 @@ input:checked + .slider:before {
   font-size: 9px;
 }
 
+/* Quality filter custom select */
+.quality-cntr {
+  /* Drop down quality pane */
+}
+.quality-cntr #ctrl-wrap-quality {
+  position: relative;
+  overflow: visible;
+}
+.quality-cntr .quality-pane {
+  box-shadow: 4px 4px 8px #c7c7c7;
+  border: solid silver 1px;
+  border-radius: 4px;
+  background: white;
+  z-index: 1000;
+  position: absolute;
+  padding: 8px;
+  /* Include/Exclude inline */
+}
+.quality-cntr .quality-pane #quality_op li, .quality-cntr .quality-pane #quality_op--standalone li {
+  display: inline-block;
+}
+.quality-cntr .quality-pane input.indent {
+  margin-left: 30px !important;
+}
+
+/* Reset */
+#filter-bar .quality-pane .ctrl-wrap {
+  display: block;
+}
+
+.filter-popup button[type=submit] {
+  margin-left: 8px;
+}
+
 table.report-grid {
   /* Ensure height enough for spinner. For tables, height acts as min-height
   as long as display not altered from browser default. */
@@ -1798,6 +1832,17 @@ div.choice-card .card-name {
   font-weight: bold;
 }
 
+div.inline * {
+  vertical-align: middle;
+}
+div.inline label {
+  margin-left: 4px;
+  margin-right: 8px;
+}
+div.inline.disabled {
+  opacity: 0.7;
+}
+
 .fancy-dialog-button {
   margin: 8px 15px 0 0;
 }
diff --git a/css/theme-bootstrap-3.css.map b/css/theme-bootstrap-3.css.map
index 05a21d25..cef943bb 100644
--- a/css/theme-bootstrap-3.css.map
+++ b/css/theme-bootstrap-3.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/theme-bootstrap-3.scss","../scss/common/_variables.scss","../scss/common/_form-controls.scss","../scss/common/_toggle-slider.scss","../scss/common/_sort-handle.scss","../scss/common/_map-controls.scss","../scss/common/_report-grid.scss","../scss/common/_mixins.scss","../scss/common/_uploader.scss","../scss/common/_media.scss","../scss/common/_status-icons.scss","../scss/common/_tooltip.scss","../scss/common/_licence-icons.scss","../scss/common/_indicia-datacomponents.scss","../scss/common/_progress-circle.scss","../scss/bootstrap-3/_form-controls.scss","../scss/bootstrap-3/_variables.scss","../scss/bootstrap-3/_indicia-datacomponents.scss","../scss/common/_loading-spinner.scss","../scss/common/_ol2-map.scss","../scss/common/_import-helper-2.scss","../scss/common/_fancy-dialog.scss"],"names":[],"mappings":"AAAA;ACAA;ACAA;EACE;;;AAGA;EACE;EACA;;;AAKF;EACE;;AAEF;EACE;;AAEF;EACE;;;AAIJ;EACE;EACA;EACA;;;AAiBF;EAbE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;;AAQJ;EACE;;;AAGF;AACA;EACE;AAgBA;AAoCA;;AAnDA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAGF;EACE;;AAEF;EA3CA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAqCA;EACE;EACA;;AAGJ;EACE;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AAKJ;EACE;;AAGJ;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAEF;EACI;;;AAIN;EACE;;;AAGF;AACE;EACA;;AACA;EACE;AACA;EACA;;AAGA;EACE;;;AAKN;EACE;;AACA;EACE;;;ACvIJ;AACA;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;AACA;EACE;;;AAGF;EACE;;;AC3DF;EACE;EACA;EACA;EACA;EACA;EACA;EACD;;;ACPD;EACE;;;AAGA;EACE;;AACA;EACE;EACA;EACA;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;EACA;;AACA;EACE;EACA;;AAIN;EACE;EACA;;AAEF;EACE;;;AAIJ;AAEE;EACE;;AAEF;EACE;EACA;;;AC5DJ;AACE;AAAA;EAEA;EACA;AAcA;;AAbA;ACJA;AAcA;ADRE;;ACLF;EACE,kBNGc;;AMDhB;EACE,kBNCa;;AMCf;EACE;;AAEF;EACE,ONHe;EMIf,kBNLkB;;AMQpB;EACE,kBNXc;;AMahB;EACE,ONVgB;EMWhB,kBNjBe;;AMmBjB;EACE;;ADhBA;EACE;;AAEF;EACE;;AAGJ;EACE;;AAGF;EACE;EACA;;AAEF;EACE;EACA;;;AEzBJ;AACA;AAKE;AAWA;;AAdA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;;ACnBJ;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AACA;EACE;EACA;AACA;;AACA;EACE;EACA;EACA;;;AAGJ;AACA;EACE;EACA;EACA;EACA;EACA;EACA;AACA;AAWA;;AAVA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AACA;EACE;EACA;;;AAIN;EACE;EACA;EACA;;;AAGF;EACE;;;ACzDF;AAIA;AAWA;EACE;EACA;EACA,QApBU;EAqBV;AACA;;AACA;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;;AAMR;AASA;EACE;EACA;;AACA;EACE;;AAEF;EAZA;EACA;EACA,kBAWyB;EAVzB,OAUgC;;AAEhC;EAfA;EACA;EACA,kBAcyB;EAbzB,OAagC;;AAEhC;EACE;;AAEF;EACE;;AAEF;EAxBA;EACA;EACA,kBAuBuB;EAtBvB,OAsB8B;;AAC5B;EA1BF;EACA;EACA,kBAyByB;EAxBzB,OAwB8B;;AAG9B;EACE;;AAEF;EACE;;;AC3JJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;;AClBF;EACE;EACA;EACA,QANU;EAOV;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;;AC+BN;AACA;EACE;;AACA;EACE;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;;;AAKN;AACA;AACE;EACA;;AAEE;EACE;;AAGJ;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA,kBZnGY;EYoGZ;EACA;EAhGJ;EACA;EACA;AA4KI;AAMA;;AAjFE;EACE;;AAGJ;EACE;;AAEF;EACE,OZ7GW;EY8GX,kBZ/Gc;;AYiHhB;EACE,OZhHY;EYiHZ,kBZvHW;;AYyHb;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EAtIN;EACA;EACA;;AAsIM;EACE;AACA;;AACA;EACE;;AAGJ;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;EACE;EACA;;AACA;EACE;;AAIJ;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AACA;EApLN;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;;AACA;EACE;;AAgKE;AACE;EACA;;AAGJ;EACE;EACA;EACA;;AACA;EACE;;AAIN;EACE;IACE;;EACA;IACE;;;AAIN;EACE;IACE;;EACA;IACE;;EAEF;IACE;;;AAIN;EACE;IACE;;EACA;IACE;;EAEF;IACE;;;AAKR;EACE;EACA;;AAEF;EA3MA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAoME;EACE;EACA;EACA;EACA;EACA;EACA;AASA;;AARA;EACE;EACA;;AAEF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AAIN;EACE;;;AAIJ;AACA;EACE;AACA;EACA;;AACA;EA9OA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAuOE;EACA;;AACA;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAGJ;EACE;;AAMN;AACE;EACA;;;AAIN;EACE,kBZ1Te;;AY6TX;EA9TJ;EACA;;AAgUI;AAME;;AALA;EACE;EACA;EACA;;AAGF;EACE;;AAGJ;EACE;;AACA;EACE;;AAMN;AN1VF;AAcA;;AM6UI;EAtVJ;EACA;;ANLA;EACE,kBNGc;;AMDhB;EACE,kBNCa;;AMCf;EACE;;AAEF;EACE,ONHe;EMIf,kBNLkB;;AMQpB;EACE,kBNXc;;AMahB;EACE,ONVgB;EMWhB,kBNjBe;;AMmBjB;EACE;;AMwUE;EACE;EACA;EACA;EAxVN;EACA;EACA;;AAwVM;EACE;;AAMN;EACE;EACA;EACA;;AAEF;EACE;EACA;AACA;EACA;;AAEF;EACE;EACA;;AAIF;EACE;;AAEF;EAEE;;;AAKN;AACA;EACE;AACA;;AAEE;EACE;EACA;;;AAKN;AAEE;EACE;EACA;;;AAKF;EA3YA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;;AACA;EACE;;AAuXJ;EACE;;AAEF;EACE;EACA;EACA;EACA;;;AAKF;EACE;;AACA;EACE;;;AAMJ;EACE;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE,OZ3bS;;AY+bf;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AACA;EACE;EACA;;AAIN;EACE;EACA;;;AAKN;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;EACA;EACA;;;AAMJ;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;;;AAIJ;AACA;EACE;;;AAEF;EACE;EA/gBA;EACA;EACA;EA+gBA,WA3hBe;EA4hBf,SA3hBiB;EA4hBjB;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKN;AAEE;EACE;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AAEF;EACE;;AACA;AACE;EACA;;AAGJ;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;AACA;EACE;;AAGA;EACE;EACA;EACA;EACA;EACA;EAzlBR;EACA;EACA;;AAylBQ;EACE;;AAEF;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;;;AAOV;EACE;IACE;IACA;;EAEF;IACE;IACA;;EAEF;IACE;IACA;;;AAKF;EACE;;;AAKF;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;;AAGJ;EACE;;AACA;EACE;EACA;;AACA;EACE;;;AAON;EACE;;;AAIJ;EACE;;;AAGF;AAEE;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;;AAKN;AACA;EACE;EACA,OZ1rBiB;EY2rBjB;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;IAAM;;EACN;IAAI;;;AAGN;EACE;;AACA;EACE;EACA;EACA;AACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AC9tBN;AACA;EACE,OANS;EAOT;EACA;EACA;;AACA;EACE,QAXO;EAYP,OAZO;;AAcT;EACE;EACA;EACA;EACA;EACA,OAjBmB;EAkBnB,WAnBiB;EAoBjB;;AAEF;EACE;EACA;EACA;;AAGA;EACE;EACA;;;AC/BN;AACE;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;;AAGJ;AACA;EACE,gBCjByB;;;ADoBzB;AAIE;;AAHA;EACE;;AAGF;EACE,eC1BqB;;AD4BvB;EACE;EACA;EACA;;AAIF;EACE;;AAKA;EACE;;AAIF;EACE;;AAIF;EACE;;;AAKR;AAAA;AAAA;AAAA;AAAA;AAME;EACE;;;AAMF;EACE;EACA;EACA;EACA;;AACA;EAGE;EACA;EACA;EACA;;;AAKN;AACA;EACE;;;AAGF;AAEE;EACE;;;AE9FJ;AAII;EACE;;AACA;EACE;;AACA;EACE;;;ACTV;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;AAEA;;AACA;AACE;EACA;EACA;EAEA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,oBACC;EAQD,YACC;;;AAYP;AAEA;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AC1HF;EACE;;AAEF;EACE;;AACA;EACE;EACA;EACA;;;AAMJ;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;;AAIJ;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;ACxGF;EACE,enBYO;EmBXP,SnBWO;EmBVP;;AACA;EACE;;AAEF;EACE;EACA,cnBIK;;;AmBET;EACE;;AACA;EACE;EACA,KANW;AAOX;EACA;EACA,QARc;EASd,OATc;EAUd;EACA;EACA;EACA;EACA,SAfW;EAgBX;;AACA;EACE;EACA;EACA;;;AAIN;EACE,enBzBO;;;AmB2BT;EACE,enB5BO;;AmB6BP;EACE;;;AAIF;EACE;;AAEF;EACE;;;AAKA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;;AAKJ;EACE,QnBzDK;EmB0DL;;AACA;EACE;EACA;EACA;;AAEE;EACE;;AAIN;EACE;;AAEF;EACE;;AAGJ;EACE;;AAEF;EACE;;AAEF;EACE;;;AAGJ;AAEE;EACE;;;AAGJ;AACA;EACE,SnB9FO;;AmB+FP;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;;ACjIJ;EACE","file":"theme-bootstrap-3.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/theme-bootstrap-3.scss","../scss/common/_variables.scss","../scss/common/_form-controls.scss","../scss/common/_toggle-slider.scss","../scss/common/_sort-handle.scss","../scss/common/_map-controls.scss","../scss/common/_report-filters.scss","../scss/common/_report-grid.scss","../scss/common/_mixins.scss","../scss/common/_uploader.scss","../scss/common/_media.scss","../scss/common/_status-icons.scss","../scss/common/_tooltip.scss","../scss/common/_licence-icons.scss","../scss/common/_indicia-datacomponents.scss","../scss/common/_progress-circle.scss","../scss/bootstrap-3/_form-controls.scss","../scss/bootstrap-3/_variables.scss","../scss/bootstrap-3/_indicia-datacomponents.scss","../scss/common/_loading-spinner.scss","../scss/common/_ol2-map.scss","../scss/common/_import-helper-2.scss","../scss/common/_fancy-dialog.scss"],"names":[],"mappings":"AAAA;ACAA;ACAA;EACE;;;AAGA;EACE;EACA;;;AAKF;EACE;;AAEF;EACE;;AAEF;EACE;;;AAIJ;EACE;EACA;EACA;;;AAiBF;EAbE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;;AAQJ;EACE;;;AAGF;AACA;EACE;AAgBA;AAoCA;;AAnDA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAGF;EACE;;AAEF;EA3CA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAqCA;EACE;EACA;;AAGJ;EACE;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AAKJ;EACE;;AAGJ;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAEF;EACI;;;AAIN;EACE;;;AAGF;AACE;EACA;;AACA;EACE;AACA;EACA;;AAGA;EACE;;;AAKN;EACE;;AACA;EACE;;;ACvIJ;AACA;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;AACA;EACE;;;AAGF;EACE;;;AC3DF;EACE;EACA;EACA;EACA;EACA;EACA;EACD;;;ACPD;EACE;;;AAGA;EACE;;AACA;EACE;EACA;EACA;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;EACA;;AACA;EACE;EACA;;AAIN;EACE;EACA;;AAEF;EACE;;;AAIJ;AAEE;EACE;;AAEF;EACE;EACA;;;AC5DJ;AACA;AAOE;;AALA;EACE;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;AACA;;AAEE;EACE;;AAGJ;EACE;;;AAKN;AACA;EACE;;;AAIA;EACE;;;ACpCJ;AACE;AAAA;EAEA;EACA;AAcA;;AAbA;ACJA;AAcA;ADRE;;ACLF;EACE,kBPGc;;AODhB;EACE,kBPCa;;AOCf;EACE;;AAEF;EACE,OPHe;EOIf,kBPLkB;;AOQpB;EACE,kBPXc;;AOahB;EACE,OPVgB;EOWhB,kBPjBe;;AOmBjB;EACE;;ADhBA;EACE;;AAEF;EACE;;AAGJ;EACE;;AAGF;EACE;EACA;;AAEF;EACE;EACA;;;AEzBJ;AACA;AAKE;AAWA;;AAdA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;;ACnBJ;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AACA;EACE;EACA;AACA;;AACA;EACE;EACA;EACA;;;AAGJ;AACA;EACE;EACA;EACA;EACA;EACA;EACA;AACA;AAWA;;AAVA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AACA;EACE;EACA;;;AAIN;EACE;EACA;EACA;;;AAGF;EACE;;;ACzDF;AAIA;AAWA;EACE;EACA;EACA,QApBU;EAqBV;AACA;;AACA;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;;AAMR;AASA;EACE;EACA;;AACA;EACE;;AAEF;EAZA;EACA;EACA,kBAWyB;EAVzB,OAUgC;;AAEhC;EAfA;EACA;EACA,kBAcyB;EAbzB,OAagC;;AAEhC;EACE;;AAEF;EACE;;AAEF;EAxBA;EACA;EACA,kBAuBuB;EAtBvB,OAsB8B;;AAC5B;EA1BF;EACA;EACA,kBAyByB;EAxBzB,OAwB8B;;AAG9B;EACE;;AAEF;EACE;;;AC3JJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;;AClBF;EACE;EACA;EACA,QANU;EAOV;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;;AC+BN;AACA;EACE;;AACA;EACE;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;;;AAKN;AACA;AACE;EACA;;AAEE;EACE;;AAGJ;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA,kBbnGY;EaoGZ;EACA;EAhGJ;EACA;EACA;AA4KI;AAMA;;AAjFE;EACE;;AAGJ;EACE;;AAEF;EACE,Ob7GW;Ea8GX,kBb/Gc;;AaiHhB;EACE,ObhHY;EaiHZ,kBbvHW;;AayHb;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EAtIN;EACA;EACA;;AAsIM;EACE;AACA;;AACA;EACE;;AAGJ;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;EACE;EACA;;AACA;EACE;;AAIJ;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AACA;EApLN;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;;AACA;EACE;;AAgKE;AACE;EACA;;AAGJ;EACE;EACA;EACA;;AACA;EACE;;AAIN;EACE;IACE;;EACA;IACE;;;AAIN;EACE;IACE;;EACA;IACE;;EAEF;IACE;;;AAIN;EACE;IACE;;EACA;IACE;;EAEF;IACE;;;AAKR;EACE;EACA;;AAEF;EA3MA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAoME;EACE;EACA;EACA;EACA;EACA;EACA;AASA;;AARA;EACE;EACA;;AAEF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AAIN;EACE;;;AAIJ;AACA;EACE;AACA;EACA;;AACA;EA9OA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAuOE;EACA;;AACA;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAGJ;EACE;;AAMN;AACE;EACA;;;AAIN;EACE,kBb1Te;;Aa6TX;EA9TJ;EACA;;AAgUI;AAME;;AALA;EACE;EACA;EACA;;AAGF;EACE;;AAGJ;EACE;;AACA;EACE;;AAMN;AN1VF;AAcA;;AM6UI;EAtVJ;EACA;;ANLA;EACE,kBPGc;;AODhB;EACE,kBPCa;;AOCf;EACE;;AAEF;EACE,OPHe;EOIf,kBPLkB;;AOQpB;EACE,kBPXc;;AOahB;EACE,OPVgB;EOWhB,kBPjBe;;AOmBjB;EACE;;AMwUE;EACE;EACA;EACA;EAxVN;EACA;EACA;;AAwVM;EACE;;AAMN;EACE;EACA;EACA;;AAEF;EACE;EACA;AACA;EACA;;AAEF;EACE;EACA;;AAIF;EACE;;AAEF;EAEE;;;AAKN;AACA;EACE;AACA;;AAEE;EACE;EACA;;;AAKN;AAEE;EACE;EACA;;;AAKF;EA3YA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;;AACA;EACE;;AAuXJ;EACE;;AAEF;EACE;EACA;EACA;EACA;;;AAKF;EACE;;AACA;EACE;;;AAMJ;EACE;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE,Ob3bS;;Aa+bf;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AACA;EACE;EACA;;AAIN;EACE;EACA;;;AAKN;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;EACA;EACA;;;AAMJ;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;;;AAIJ;AACA;EACE;;;AAEF;EACE;EA/gBA;EACA;EACA;EA+gBA,WA3hBe;EA4hBf,SA3hBiB;EA4hBjB;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKN;AAEE;EACE;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AAEF;EACE;;AACA;AACE;EACA;;AAGJ;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;AACA;EACE;;AAGA;EACE;EACA;EACA;EACA;EACA;EAzlBR;EACA;EACA;;AAylBQ;EACE;;AAEF;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;;;AAOV;EACE;IACE;IACA;;EAEF;IACE;IACA;;EAEF;IACE;IACA;;;AAKF;EACE;;;AAKF;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;;AAGJ;EACE;;AACA;EACE;EACA;;AACA;EACE;;;AAON;EACE;;;AAIJ;EACE;;;AAGF;AAEE;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;;AAKN;AACA;EACE;EACA,Ob1rBiB;Ea2rBjB;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;IAAM;;EACN;IAAI;;;AAGN;EACE;;AACA;EACE;EACA;EACA;AACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AC9tBN;AACA;EACE,OANS;EAOT;EACA;EACA;;AACA;EACE,QAXO;EAYP,OAZO;;AAcT;EACE;EACA;EACA;EACA;EACA,OAjBmB;EAkBnB,WAnBiB;EAoBjB;;AAEF;EACE;EACA;EACA;;AAGA;EACE;EACA;;;AC/BN;AACE;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;;AAGJ;AACA;EACE,gBCjByB;;;ADoBzB;AAIE;;AAHA;EACE;;AAGF;EACE,eC1BqB;;AD4BvB;EACE;EACA;EACA;;AAIF;EACE;;AAKA;EACE;;AAIF;EACE;;AAIF;EACE;;;AAKR;AAAA;AAAA;AAAA;AAAA;AAME;EACE;;;AAMF;EACE;EACA;EACA;EACA;;AACA;EAGE;EACA;EACA;EACA;;;AAKN;AACA;EACE;;;AAGF;AAEE;EACE;;;AE9FJ;AAII;EACE;;AACA;EACE;;AACA;EACE;;;ACTV;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;AAEA;;AACA;AACE;EACA;EACA;EAEA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,oBACC;EAQD,YACC;;;AAYP;AAEA;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AC1HF;EACE;;AAEF;EACE;;AACA;EACE;EACA;EACA;;;AAMJ;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;;AAIJ;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;ACxGF;EACE,epBYO;EoBXP,SpBWO;EoBVP;;AACA;EACE;;AAEF;EACE;EACA,cpBIK;;;AoBET;EACE;;AACA;EACE;EACA,KANW;AAOX;EACA;EACA,QARc;EASd,OATc;EAUd;EACA;EACA;EACA;EACA,SAfW;EAgBX;;AACA;EACE;EACA;EACA;;;AAIN;EACE,epBzBO;;;AoB2BT;EACE,epB5BO;;AoB6BP;EACE;;;AAIF;EACE;;AAEF;EACE;;;AAKA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;;AAKJ;EACE,QpBzDK;EoB0DL;;AACA;EACE;EACA;EACA;;AAEE;EACE;;AAIN;EACE;;AAEF;EACE;;AAGJ;EACE;;AAEF;EACE;;AAEF;EACE;;;AAGJ;AAEE;EACE;;;AAGJ;AACA;EACE,SpB9FO;;AoB+FP;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;;AAIF;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;;AC7IJ;EACE","file":"theme-bootstrap-3.css"}
\ No newline at end of file
diff --git a/css/theme-generic.css b/css/theme-generic.css
index 64ecbeac..3dcb4b1d 100644
--- a/css/theme-generic.css
+++ b/css/theme-generic.css
@@ -270,6 +270,40 @@ input:checked + .slider:before {
   font-size: 9px;
 }
 
+/* Quality filter custom select */
+.quality-cntr {
+  /* Drop down quality pane */
+}
+.quality-cntr #ctrl-wrap-quality {
+  position: relative;
+  overflow: visible;
+}
+.quality-cntr .quality-pane {
+  box-shadow: 4px 4px 8px #c7c7c7;
+  border: solid silver 1px;
+  border-radius: 4px;
+  background: white;
+  z-index: 1000;
+  position: absolute;
+  padding: 8px;
+  /* Include/Exclude inline */
+}
+.quality-cntr .quality-pane #quality_op li, .quality-cntr .quality-pane #quality_op--standalone li {
+  display: inline-block;
+}
+.quality-cntr .quality-pane input.indent {
+  margin-left: 30px !important;
+}
+
+/* Reset */
+#filter-bar .quality-pane .ctrl-wrap {
+  display: block;
+}
+
+.filter-popup button[type=submit] {
+  margin-left: 8px;
+}
+
 table.report-grid {
   /* Ensure height enough for spinner. For tables, height acts as min-height
   as long as display not altered from browser default. */
@@ -1824,6 +1858,17 @@ div.choice-card .card-name {
   font-weight: bold;
 }
 
+div.inline * {
+  vertical-align: middle;
+}
+div.inline label {
+  margin-left: 4px;
+  margin-right: 8px;
+}
+div.inline.disabled {
+  opacity: 0.7;
+}
+
 .fancy-dialog-button {
   margin: 8px 15px 0 0;
 }
@@ -1995,4 +2040,26 @@ progress.progress::-moz-progress-bar {
   max-width: 100%;
 }
 
+.pull-right {
+  float: right;
+}
+
+.pull-left {
+  float: left;
+}
+
+#redet-form .helpText {
+  margin: 0;
+}
+#redet-form .form-control {
+  /* Allow space for required * */
+  width: 95%;
+}
+#redet-form label {
+  width: auto;
+}
+#redet-form input[type=checkbox] {
+  margin: 10px 8px;
+}
+
 /*# sourceMappingURL=theme-generic.css.map */
diff --git a/css/theme-generic.css.map b/css/theme-generic.css.map
index 16f6168d..49cb059b 100644
--- a/css/theme-generic.css.map
+++ b/css/theme-generic.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/theme-generic.scss","../scss/common/_variables.scss","../scss/common/_form-controls.scss","../scss/common/_toggle-slider.scss","../scss/common/_sort-handle.scss","../scss/common/_map-controls.scss","../scss/common/_report-grid.scss","../scss/common/_mixins.scss","../scss/common/_uploader.scss","../scss/common/_media.scss","../scss/common/_status-icons.scss","../scss/common/_tooltip.scss","../scss/common/_licence-icons.scss","../scss/common/_indicia-datacomponents.scss","../scss/common/_progress-circle.scss","../scss/generic/_form-controls.scss","../scss/generic/_variables.scss","../scss/common/_loading-spinner.scss","../scss/common/_ol2-map.scss","../scss/common/_import-helper-2.scss","../scss/common/_fancy-dialog.scss","../scss/generic/_bootstrapify.scss"],"names":[],"mappings":"AAAA;ACAA;ACAA;EACE;;;AAGA;EACE;EACA;;;AAKF;EACE;;AAEF;EACE;;AAEF;EACE;;;AAIJ;EACE;EACA;EACA;;;AAiBF;EAbE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;;AAQJ;EACE;;;AAGF;AACA;EACE;AAgBA;AAoCA;;AAnDA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAGF;EACE;;AAEF;EA3CA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAqCA;EACE;EACA;;AAGJ;EACE;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AAKJ;EACE;;AAGJ;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAEF;EACI;;;AAIN;EACE;;;AAGF;AACE;EACA;;AACA;EACE;AACA;EACA;;AAGA;EACE;;;AAKN;EACE;;AACA;EACE;;;ACvIJ;AACA;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;AACA;EACE;;;AAGF;EACE;;;AC3DF;EACE;EACA;EACA;EACA;EACA;EACA;EACD;;;ACPD;EACE;;;AAGA;EACE;;AACA;EACE;EACA;EACA;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;EACA;;AACA;EACE;EACA;;AAIN;EACE;EACA;;AAEF;EACE;;;AAIJ;AAEE;EACE;;AAEF;EACE;EACA;;;AC5DJ;AACE;AAAA;EAEA;EACA;AAcA;;AAbA;ACJA;AAcA;ADRE;;ACLF;EACE,kBNGc;;AMDhB;EACE,kBNCa;;AMCf;EACE;;AAEF;EACE,ONHe;EMIf,kBNLkB;;AMQpB;EACE,kBNXc;;AMahB;EACE,ONVgB;EMWhB,kBNjBe;;AMmBjB;EACE;;ADhBA;EACE;;AAEF;EACE;;AAGJ;EACE;;AAGF;EACE;EACA;;AAEF;EACE;EACA;;;AEzBJ;AACA;AAKE;AAWA;;AAdA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;;ACnBJ;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AACA;EACE;EACA;AACA;;AACA;EACE;EACA;EACA;;;AAGJ;AACA;EACE;EACA;EACA;EACA;EACA;EACA;AACA;AAWA;;AAVA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AACA;EACE;EACA;;;AAIN;EACE;EACA;EACA;;;AAGF;EACE;;;ACzDF;AAIA;AAWA;EACE;EACA;EACA,QApBU;EAqBV;AACA;;AACA;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;;AAMR;AASA;EACE;EACA;;AACA;EACE;;AAEF;EAZA;EACA;EACA,kBAWyB;EAVzB,OAUgC;;AAEhC;EAfA;EACA;EACA,kBAcyB;EAbzB,OAagC;;AAEhC;EACE;;AAEF;EACE;;AAEF;EAxBA;EACA;EACA,kBAuBuB;EAtBvB,OAsB8B;;AAC5B;EA1BF;EACA;EACA,kBAyByB;EAxBzB,OAwB8B;;AAG9B;EACE;;AAEF;EACE;;;AC3JJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;;AClBF;EACE;EACA;EACA,QANU;EAOV;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;;AC+BN;AACA;EACE;;AACA;EACE;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;;;AAKN;AACA;AACE;EACA;;AAEE;EACE;;AAGJ;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA,kBZnGY;EYoGZ;EACA;EAhGJ;EACA;EACA;AA4KI;AAMA;;AAjFE;EACE;;AAGJ;EACE;;AAEF;EACE,OZ7GW;EY8GX,kBZ/Gc;;AYiHhB;EACE,OZhHY;EYiHZ,kBZvHW;;AYyHb;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EAtIN;EACA;EACA;;AAsIM;EACE;AACA;;AACA;EACE;;AAGJ;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;EACE;EACA;;AACA;EACE;;AAIJ;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AACA;EApLN;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;;AACA;EACE;;AAgKE;AACE;EACA;;AAGJ;EACE;EACA;EACA;;AACA;EACE;;AAIN;EACE;IACE;;EACA;IACE;;;AAIN;EACE;IACE;;EACA;IACE;;EAEF;IACE;;;AAIN;EACE;IACE;;EACA;IACE;;EAEF;IACE;;;AAKR;EACE;EACA;;AAEF;EA3MA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAoME;EACE;EACA;EACA;EACA;EACA;EACA;AASA;;AARA;EACE;EACA;;AAEF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AAIN;EACE;;;AAIJ;AACA;EACE;AACA;EACA;;AACA;EA9OA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAuOE;EACA;;AACA;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAGJ;EACE;;AAMN;AACE;EACA;;;AAIN;EACE,kBZ1Te;;AY6TX;EA9TJ;EACA;;AAgUI;AAME;;AALA;EACE;EACA;EACA;;AAGF;EACE;;AAGJ;EACE;;AACA;EACE;;AAMN;AN1VF;AAcA;;AM6UI;EAtVJ;EACA;;ANLA;EACE,kBNGc;;AMDhB;EACE,kBNCa;;AMCf;EACE;;AAEF;EACE,ONHe;EMIf,kBNLkB;;AMQpB;EACE,kBNXc;;AMahB;EACE,ONVgB;EMWhB,kBNjBe;;AMmBjB;EACE;;AMwUE;EACE;EACA;EACA;EAxVN;EACA;EACA;;AAwVM;EACE;;AAMN;EACE;EACA;EACA;;AAEF;EACE;EACA;AACA;EACA;;AAEF;EACE;EACA;;AAIF;EACE;;AAEF;EAEE;;;AAKN;AACA;EACE;AACA;;AAEE;EACE;EACA;;;AAKN;AAEE;EACE;EACA;;;AAKF;EA3YA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;;AACA;EACE;;AAuXJ;EACE;;AAEF;EACE;EACA;EACA;EACA;;;AAKF;EACE;;AACA;EACE;;;AAMJ;EACE;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE,OZ3bS;;AY+bf;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AACA;EACE;EACA;;AAIN;EACE;EACA;;;AAKN;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;EACA;EACA;;;AAMJ;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;;;AAIJ;AACA;EACE;;;AAEF;EACE;EA/gBA;EACA;EACA;EA+gBA,WA3hBe;EA4hBf,SA3hBiB;EA4hBjB;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKN;AAEE;EACE;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AAEF;EACE;;AACA;AACE;EACA;;AAGJ;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;AACA;EACE;;AAGA;EACE;EACA;EACA;EACA;EACA;EAzlBR;EACA;EACA;;AAylBQ;EACE;;AAEF;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;;;AAOV;EACE;IACE;IACA;;EAEF;IACE;IACA;;EAEF;IACE;IACA;;;AAKF;EACE;;;AAKF;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;;AAGJ;EACE;;AACA;EACE;EACA;;AACA;EACE;;;AAON;EACE;;;AAIJ;EACE;;;AAGF;AAEE;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;;AAKN;AACA;EACE;EACA,OZ1rBiB;EY2rBjB;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;IAAM;;EACN;IAAI;;;AAGN;EACE;;AACA;EACE;EACA;EACA;AACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AC9tBN;AACA;EACE,OANS;EAOT;EACA;EACA;;AACA;EACE,QAXO;EAYP,OAZO;;AAcT;EACE;EACA;EACA;EACA;EACA,OAjBmB;EAkBnB,WAnBiB;EAoBjB;;AAEF;EACE;EACA;EACA;;AAGA;EACE;EACA;;;AC/BN;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE,cdNe;EcOf;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;;AAIJ;EACE,OCxBY;EDyBZ;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;AAAA;EAEE;EACA;EACA;EACA,SCrCgB;EDsChB,uBCvCe;EDwCf,oBCxCe;EDyCf,eCzCe;;;AD4CjB;EACE;;;AAGF;AACA;EACE;;;AAGF;AACA;EACE;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;AACA;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AElHF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;AAEA;;AACA;AACE;EACA;EACA;EAEA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,oBACC;EAQD,YACC;;;AAYP;AAEA;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AC1HF;EACE;;AAEF;EACE;;AACA;EACE;EACA;EACA;;;AAMJ;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;;AAIJ;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;ACxGF;EACE,elBYO;EkBXP,SlBWO;EkBVP;;AACA;EACE;;AAEF;EACE;EACA,clBIK;;;AkBET;EACE;;AACA;EACE;EACA,KANW;AAOX;EACA;EACA,QARc;EASd,OATc;EAUd;EACA;EACA;EACA;EACA,SAfW;EAgBX;;AACA;EACE;EACA;EACA;;;AAIN;EACE,elBzBO;;;AkB2BT;EACE,elB5BO;;AkB6BP;EACE;;;AAIF;EACE;;AAEF;EACE;;;AAKA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;;AAKJ;EACE,QlBzDK;EkB0DL;;AACA;EACE;EACA;EACA;;AAEE;EACE;;AAIN;EACE;;AAEF;EACE;;AAGJ;EACE;;AAEF;EACE;;AAEF;EACE;;;AAGJ;AAEE;EACE;;;AAGJ;AACA;EACE,SlB9FO;;AkB+FP;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;;ACjIJ;EACE;;;ACDF;AAKA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE,cAXS;EAYT;;AAEF;EACE,cAdY;EAeZ;;AAEF;EACE,cAjBW;EAkBX;;AAGF;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE,cAvCS;;AAwCT;EACE;;AAGJ;EACE,cA5CY;;AA6CZ;EACE;;AAGJ;EACE,cAjDW;;AAkDX;EACE;;;AAKN;EACE;;AACA;EACE;EACA;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;;;AAGF;AACA;EAEI;IACE;;EAEF;IACE;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAEF;IACE;;;AAMJ;EACE;EACA;EACA;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;;;AAKN;EACC;EACA;EACA;EACC;EACA;;;AAGF;EACE;EACA;;;AAEF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA","file":"theme-generic.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/theme-generic.scss","../scss/common/_variables.scss","../scss/common/_form-controls.scss","../scss/common/_toggle-slider.scss","../scss/common/_sort-handle.scss","../scss/common/_map-controls.scss","../scss/common/_report-filters.scss","../scss/common/_report-grid.scss","../scss/common/_mixins.scss","../scss/common/_uploader.scss","../scss/common/_media.scss","../scss/common/_status-icons.scss","../scss/common/_tooltip.scss","../scss/common/_licence-icons.scss","../scss/common/_indicia-datacomponents.scss","../scss/common/_progress-circle.scss","../scss/generic/_form-controls.scss","../scss/generic/_variables.scss","../scss/common/_loading-spinner.scss","../scss/common/_ol2-map.scss","../scss/common/_import-helper-2.scss","../scss/common/_fancy-dialog.scss","../scss/generic/_bootstrapify.scss","../scss/generic/_verification.scss"],"names":[],"mappings":"AAAA;ACAA;ACAA;EACE;;;AAGA;EACE;EACA;;;AAKF;EACE;;AAEF;EACE;;AAEF;EACE;;;AAIJ;EACE;EACA;EACA;;;AAiBF;EAbE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;;AAQJ;EACE;;;AAGF;AACA;EACE;AAgBA;AAoCA;;AAnDA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAGF;EACE;;AAEF;EA3CA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAqCA;EACE;EACA;;AAGJ;EACE;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AAKJ;EACE;;AAGJ;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAEF;EACI;;;AAIN;EACE;;;AAGF;AACE;EACA;;AACA;EACE;AACA;EACA;;AAGA;EACE;;;AAKN;EACE;;AACA;EACE;;;ACvIJ;AACA;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;AACA;EACE;;;AAGF;EACE;;;AC3DF;EACE;EACA;EACA;EACA;EACA;EACA;EACD;;;ACPD;EACE;;;AAGA;EACE;;AACA;EACE;EACA;EACA;EACA;;;AAKN;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;EACA;;AACA;EACE;EACA;;AAIN;EACE;EACA;;AAEF;EACE;;;AAIJ;AAEE;EACE;;AAEF;EACE;EACA;;;AC5DJ;AACA;AAOE;;AALA;EACE;EACA;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;AACA;;AAEE;EACE;;AAGJ;EACE;;;AAKN;AACA;EACE;;;AAIA;EACE;;;ACpCJ;AACE;AAAA;EAEA;EACA;AAcA;;AAbA;ACJA;AAcA;ADRE;;ACLF;EACE,kBPGc;;AODhB;EACE,kBPCa;;AOCf;EACE;;AAEF;EACE,OPHe;EOIf,kBPLkB;;AOQpB;EACE,kBPXc;;AOahB;EACE,OPVgB;EOWhB,kBPjBe;;AOmBjB;EACE;;ADhBA;EACE;;AAEF;EACE;;AAGJ;EACE;;AAGF;EACE;EACA;;AAEF;EACE;EACA;;;AEzBJ;AACA;AAKE;AAWA;;AAdA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;;;ACnBJ;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AACA;EACE;EACA;AACA;;AACA;EACE;EACA;EACA;;;AAGJ;AACA;EACE;EACA;EACA;EACA;EACA;EACA;AACA;AAWA;;AAVA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AACA;EACE;EACA;;;AAIN;EACE;EACA;EACA;;;AAGF;EACE;;;ACzDF;AAIA;AAWA;EACE;EACA;EACA,QApBU;EAqBV;AACA;;AACA;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;AACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;AACE;EACA;;AACA;EACE;;AAEF;EACE;;;AAMR;AASA;EACE;EACA;;AACA;EACE;;AAEF;EAZA;EACA;EACA,kBAWyB;EAVzB,OAUgC;;AAEhC;EAfA;EACA;EACA,kBAcyB;EAbzB,OAagC;;AAEhC;EACE;;AAEF;EACE;;AAEF;EAxBA;EACA;EACA,kBAuBuB;EAtBvB,OAsB8B;;AAC5B;EA1BF;EACA;EACA,kBAyByB;EAxBzB,OAwB8B;;AAG9B;EACE;;AAEF;EACE;;;AC3JJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;;AClBF;EACE;EACA;EACA,QANU;EAOV;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;;AC+BN;AACA;EACE;;AACA;EACE;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;;;AAKN;AACA;AACE;EACA;;AAEE;EACE;;AAGJ;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA,kBbnGY;EaoGZ;EACA;EAhGJ;EACA;EACA;AA4KI;AAMA;;AAjFE;EACE;;AAGJ;EACE;;AAEF;EACE,Ob7GW;Ea8GX,kBb/Gc;;AaiHhB;EACE,ObhHY;EaiHZ,kBbvHW;;AayHb;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EAtIN;EACA;EACA;;AAsIM;EACE;AACA;;AACA;EACE;;AAGJ;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAIN;EACE;EACA;;AACA;EACE;;AAIJ;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AACA;EApLN;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;;AACA;EACE;;AAgKE;AACE;EACA;;AAGJ;EACE;EACA;EACA;;AACA;EACE;;AAIN;EACE;IACE;;EACA;IACE;;;AAIN;EACE;IACE;;EACA;IACE;;EAEF;IACE;;;AAIN;EACE;IACE;;EACA;IACE;;EAEF;IACE;;;AAKR;EACE;EACA;;AAEF;EA3MA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAoME;EACE;EACA;EACA;EACA;EACA;EACA;AASA;;AARA;EACE;EACA;;AAEF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AAIN;EACE;;;AAIJ;AACA;EACE;AACA;EACA;;AACA;EA9OA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAuOE;EACA;;AACA;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAGJ;EACE;;AAMN;AACE;EACA;;;AAIN;EACE,kBb1Te;;Aa6TX;EA9TJ;EACA;;AAgUI;AAME;;AALA;EACE;EACA;EACA;;AAGF;EACE;;AAGJ;EACE;;AACA;EACE;;AAMN;AN1VF;AAcA;;AM6UI;EAtVJ;EACA;;ANLA;EACE,kBPGc;;AODhB;EACE,kBPCa;;AOCf;EACE;;AAEF;EACE,OPHe;EOIf,kBPLkB;;AOQpB;EACE,kBPXc;;AOahB;EACE,OPVgB;EOWhB,kBPjBe;;AOmBjB;EACE;;AMwUE;EACE;EACA;EACA;EAxVN;EACA;EACA;;AAwVM;EACE;;AAMN;EACE;EACA;EACA;;AAEF;EACE;EACA;AACA;EACA;;AAEF;EACE;EACA;;AAIF;EACE;;AAEF;EAEE;;;AAKN;AACA;EACE;AACA;;AAEE;EACE;EACA;;;AAKN;AAEE;EACE;EACA;;;AAKF;EA3YA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;EACA;;AACA;EACE;;AAuXJ;EACE;;AAEF;EACE;EACA;EACA;EACA;;;AAKF;EACE;;AACA;EACE;;;AAMJ;EACE;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE,Ob3bS;;Aa+bf;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AACA;EACE;EACA;;AAIN;EACE;EACA;;;AAKN;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AACA;EACE;EACA;EACA;;;AAMJ;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;;;AAIJ;AACA;EACE;;;AAEF;EACE;EA/gBA;EACA;EACA;EA+gBA,WA3hBe;EA4hBf,SA3hBiB;EA4hBjB;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKN;AAEE;EACE;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AAEF;EACE;;AACA;AACE;EACA;;AAGJ;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;AACA;EACE;;AAGA;EACE;EACA;EACA;EACA;EACA;EAzlBR;EACA;EACA;;AAylBQ;EACE;;AAEF;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;;;AAOV;EACE;IACE;IACA;;EAEF;IACE;IACA;;EAEF;IACE;IACA;;;AAKF;EACE;;;AAKF;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;;AAGJ;EACE;;AACA;EACE;EACA;;AACA;EACE;;;AAON;EACE;;;AAIJ;EACE;;;AAGF;AAEE;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;;AAKN;AACA;EACE;EACA,Ob1rBiB;Ea2rBjB;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;IAAM;;EACN;IAAI;;;AAGN;EACE;;AACA;EACE;EACA;EACA;AACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AC9tBN;AACA;EACE,OANS;EAOT;EACA;EACA;;AACA;EACE,QAXO;EAYP,OAZO;;AAcT;EACE;EACA;EACA;EACA;EACA,OAjBmB;EAkBnB,WAnBiB;EAoBjB;;AAEF;EACE;EACA;EACA;;AAGA;EACE;EACA;;;AC/BN;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE,cfNe;EeOf;EACA;;AAEF;EACE;;AAEF;EACE;;AAEF;EACE;;;AAIJ;EACE,OCxBY;EDyBZ;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;AAAA;EAEE;EACA;EACA;EACA,SCrCgB;EDsChB,uBCvCe;EDwCf,oBCxCe;EDyCf,eCzCe;;;AD4CjB;EACE;;;AAGF;AACA;EACE;;;AAGF;AACA;EACE;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;AACA;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AElHF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;AAEA;;AACA;AACE;EACA;EACA;EAEA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,oBACC;EAQD,YACC;;;AAYP;AAEA;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AAGJ;EACE;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;;AC1HF;EACE;;AAEF;EACE;;AACA;EACE;EACA;EACA;;;AAMJ;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;;AAIJ;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;ACxGF;EACE,enBYO;EmBXP,SnBWO;EmBVP;;AACA;EACE;;AAEF;EACE;EACA,cnBIK;;;AmBET;EACE;;AACA;EACE;EACA,KANW;AAOX;EACA;EACA,QARc;EASd,OATc;EAUd;EACA;EACA;EACA;EACA,SAfW;EAgBX;;AACA;EACE;EACA;EACA;;;AAIN;EACE,enBzBO;;;AmB2BT;EACE,enB5BO;;AmB6BP;EACE;;;AAIF;EACE;;AAEF;EACE;;;AAKA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;;AAKJ;EACE,QnBzDK;EmB0DL;;AACA;EACE;EACA;EACA;;AAEE;EACE;;AAIN;EACE;;AAEF;EACE;;AAGJ;EACE;;AAEF;EACE;;AAEF;EACE;;;AAGJ;AAEE;EACE;;;AAGJ;AACA;EACE,SnB9FO;;AmB+FP;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;;;AAIF;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;;AC7IJ;EACE;;;ACDF;AAKA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE,cAXS;EAYT;;AAEF;EACE,cAdY;EAeZ;;AAEF;EACE,cAjBW;EAkBX;;AAGF;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE,cAvCS;;AAwCT;EACE;;AAGJ;EACE,cA5CY;;AA6CZ;EACE;;AAGJ;EACE,cAjDW;;AAkDX;EACE;;;AAKN;EACE;;AACA;EACE;EACA;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;;;AAGF;AACA;EAEI;IACE;;EAEF;IACE;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAEF;IACE;;;AAMJ;EACE;EACA;EACA;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;;;AAKN;EACC;EACA;EACA;EACC;EACA;;;AAGF;EACE;EACA;;;AAEF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;ACnLA;EACE;;AAEF;AACE;EACA;;AAEF;EACE;;AAEF;EACE","file":"theme-generic.css"}
\ No newline at end of file
diff --git a/js/controls/speciesmap_controls.js b/js/controls/speciesmap_controls.js
index ad42809e..962aebb4 100644
--- a/js/controls/speciesmap_controls.js
+++ b/js/controls/speciesmap_controls.js
@@ -278,8 +278,8 @@ var control_speciesmap_addcontrols;
       $('#' + indiciaData.control_speciesmap_opts.messageId).empty().append(indiciaData.lang.speciesMap.AddDataMessage);
       $('#' + indiciaData.control_speciesmap_opts.buttonsId).each(function () {window.scroll(0, $(this).offset().top); });
       showButtons(['cancel', 'finish']);
-      if (typeof indiciaData.control_speciesmap_opts.sampleMethodId !== "undefined" && indiciaData.control_speciesmap_opts.sampleMethodId !== '') {
-        $('<input type="hidden" name="sc:' + gridIdx + '::sample:sample_method_id" value="' + indiciaData.control_speciesmap_opts.sampleMethodId + '" />')
+      if (typeof indiciaData.control_speciesmap_opts.sample_method_id !== "undefined" && indiciaData.control_speciesmap_opts.sample_method_id !== '') {
+        $('<input type="hidden" name="sc:' + gridIdx + '::sample:sample_method_id" value="' + indiciaData.control_speciesmap_opts.sample_method_id + '" />')
           .appendTo(subsampleBlock);
         sampleControlsDiv = $('#' + indiciaData.control_speciesmap_opts.id + '-subsample-ctrls')
           .clone(true, true)
diff --git a/js/indicia.datacomponents/idc.core.js b/js/indicia.datacomponents/idc.core.js
index c46fdf1b..c61fa29c 100644
--- a/js/indicia.datacomponents/idc.core.js
+++ b/js/indicia.datacomponents/idc.core.js
@@ -746,11 +746,6 @@
       var key = entity === 'parent_event' ? 'parent_attributes' : 'attributes';
       // Tolerate sample or event for entity parameter.
       entity = $.inArray(entity, ['sample', 'event', 'parent_event']) > -1 ? 'event' : 'occurrence';
-      // When requesting an event attribute, allow the parent event attribute
-      // value to be used if necessary.
-      if (entity === 'event' && key === 'attributes' && !doc[entity][key] && doc[entity]['parent_attributes']) {
-        key = 'parent_attributes';
-      }
       if (doc[entity] && doc[entity][key]) {
         $.each(doc[entity][key], function eachAttr() {
           if (this.id === params[1]) {
@@ -758,6 +753,15 @@
           }
         });
       }
+      // When requesting an event attribute, allow the parent event attribute
+      // value to be used if necessary.
+      if (doc[entity] && output.length === 0 && entity === 'event' && key === 'attributes' && doc[entity]['parent_attributes']) {
+        $.each(doc[entity]['parent_attributes'], function eachAttr() {
+          if (this.id === params[1]) {
+            output.push(this.value);
+          }
+        });
+      }
       return output.join('; ');
     },
 
diff --git a/js/reportFilters.js b/js/reportFilters.js
index 81f8f8de..bb0e287c 100644
--- a/js/reportFilters.js
+++ b/js/reportFilters.js
@@ -147,8 +147,8 @@ jQuery(document).ready(function ($) {
             // Use the myGroups list to look them up
             $.each(indiciaData.myGroups, function () {
               if (this[0] === parseInt(groupId)) {
-                foundIds.push(this[0]);
-                foundNames.push(this[1]);
+                foundIds.push(this['id']);
+                foundNames.push(this['title']);
               }
             });
           });
@@ -275,6 +275,26 @@ jQuery(document).ready(function ($) {
       },
     },
     where: {
+      loadFilter: function () {
+        var filter;
+        var locationsToLoad;
+        if (typeof indiciaData.mapdiv !== 'undefined') {
+          filter = indiciaData.filter.def;
+          if (filter.searchArea) {
+            loadPolygon(filter.searchArea);
+          } else if (filter.location_id || filter.location_list || filter.indexed_location_id || filter.indexed_location_list) {
+            // need to load filter location boundaries onto map. Location_id variants are for legacy
+            if (filter.location_id && !filter.location_list) {
+              filter.location_list = filter.location_id;
+            }
+            if (filter.indexed_location_id && !filter.indexed_location_list) {
+              filter.indexed_location_list = filter.indexed_location_id;
+            }
+            locationsToLoad = filter.indexed_location_list ? filter.indexed_location_list : filter.location_list;
+            loadSites(locationsToLoad);
+          }
+        }
+      },
       getDescription: function (filterDef) {
         if (filterDef.remembered_location_name) {
           return 'Records in ' + filterDef.remembered_location_name;
@@ -296,11 +316,17 @@ jQuery(document).ready(function ($) {
     },
     who: {
       getDescription: function (filterDef) {
-        if (filterDef.my_records) {
-          return indiciaData.lang.reportFilterParser.MyRecords;
-        } else {
-          return '';
+        let phrases = [];
+        if (filterDef.my_records && filterDef.my_records === '1') {
+          phrases.push(indiciaData.lang.reportFilterParser.MyRecords);
+        } else if (filterDef.my_records && filterDef.my_records === '0') {
+          phrases.push(indiciaData.lang.reportFilterParser.NotMyRecords);
+        }
+        if (filterDef.recorder_name) {
+          let nameList = filterDef.recorder_name.replace(/\s+/g, indiciaData.lang.reportFilterParser.ListJoin);
+          phrases.push(indiciaData.lang.reportFilterParser.RecorderNameContains.replace('{1}', nameList));
         }
+        return phrases.join('<br/>');
       },
     },
     occ_id: {
@@ -331,28 +357,75 @@ jQuery(document).ready(function ($) {
       },
     },
     quality: {
+      statusDescriptionFromFilter: function (quality, quality_op) {
+        if (typeof quality === 'undefined') {
+          quality = 'all';
+        } else {
+          quality = typeof quality === 'string' ? quality : quality.toString();
+        }
+        if (typeof quality_op === 'undefined') {
+          quality_op = 'in';
+        }
+        let statuses = typeof quality === 'object' ? quality : quality.split(',');
+        let statusTerms = [];
+        $.each(statuses, function () {
+          if (this !== 'all' && statuses.indexOf('all') > -1) {
+            // If all checked, only interested in the all option.
+            return true;
+          }
+          if (this.match(/^[RV][1245]$/) && statuses.indexOf(this.substring(0, 1)) > -1) {
+            // If V or R checked, can skip the 2nd levels.
+            return true;
+          }
+          statusTerms.push(indiciaData.lang.reportFilters['quality:' + this]);
+        });
+        // Update all copies of the inputs with the text and the hidden filter value.
+        return indiciaData.lang.reportFilters['quality_op:' + quality_op] + ' ' + statusTerms.join(', ');
+      },
+      fixLegacyFilter: function(filterDef) {
+        // Handle some legacy filter options. Note that Trusted is not supported on ES currently.
+        if (filterDef.quality === '!R') {
+          filterDef.quality = 'R';
+          filterDef.quality_op = 'not in';
+        } else if (filterDef.quality === '!D') {
+          filterDef.quality = 'D';
+          filterDef.quality_op = 'not in';
+        } else if (filterDef.quality === '-3') {
+          filterDef.quality = 'C3,V';
+          filterDef.quality_op = 'in';
+        } else if (filterDef.quality === 'C') {
+          filterDef.quality = 'R';
+          filterDef.quality_op = 'not in';
+          filterDef.certainty = 'C';
+        } else if (filterDef.quality === 'L') {
+          filterDef.quality = 'R';
+          filterDef.quality_op = 'not in';
+          filterDef.certainty = 'L';
+        } else if (filterDef.quality === 'DR') {
+          filterDef.quality = 'D,R';
+          filterDef.quality_op = 'in';
+        }
+        // Autochecks and autocheck_rule now merged into 1.
+        if (filterDef.autocheck_rule) {
+          filterDef.autochecks = filterDef.autocheck_rule;
+          delete filterDef.autocheck_rule;
+        }
+      },
       getDescription: function (filterDef, sep) {
         var r = [];
         var op;
-        var quality;
-        if (typeof filterDef.quality === 'undefined') {
-          quality = 'all';
-        } else {
-          quality = typeof filterDef.quality === 'string'
-            ? filterDef.quality : filterDef.quality.toString();
+        if (typeof filterDef.quality !== 'undefined' && filterDef.quality !== 'all') {
+          r.push(indiciaData.filterParser.quality.statusDescriptionFromFilter(filterDef.quality, filterDef.quality_op));
         }
-        if (quality !== 'all') {
-          r.push($('#quality-filter option[value=' + quality.replace('!', '\\!') + ']').html());
+        let certainties = [];
+        $.each($('#certainty-filter :checked'), function() {
+          certainties.push($('label[for="' + this.id + '"]').text().toLowerCase());
+        });
+        if (certainties.length > 0) {
+          r.push(indiciaData.lang.reportFilters.recorderCertaintyWas + ' ' + certainties.join(indiciaData.lang.reportFilters.orListJoin));
         }
         if (filterDef.autochecks) {
-          r.push(indiciaData.lang.reportFilterParser['Autochecks' + filterDef.autochecks]);
-        }
-        if (filterDef.autocheck_rule) {
-          if (typeof indiciaData.lang.reportFilterParser['Rule_' + filterDef.autocheck_rule] !== 'undefined') {
-            r.push(indiciaData.lang.reportFilterParser['Rule_' + filterDef.autocheck_rule]);
-          } else {
-            r.push(filterDef.autocheck_rule);
-          }
+          r.push(indiciaData.lang.reportFilterParser['Autochecks_' + filterDef.autochecks]);
         }
         if (filterDef.identification_difficulty) {
           op = typeof filterDef.identification_difficulty_op === 'undefined' ?
@@ -366,6 +439,29 @@ jQuery(document).ready(function ($) {
         } else if (filterDef.has_photos && filterDef.has_photos === '0') {
           r.push(indiciaData.lang.reportFilterParser.HasNoPhotos);
         }
+        if ($('#licences :checked').length > 0 && $('#licences :checked').length < 3) {
+          let licences = [];
+          $.each($('#licences :checked'), function() {
+            licences.push($('label[for="' + this.id + '"]').text().toLowerCase());
+          });
+          r.push(indiciaData.lang.reportFilters.licenceIs + ' ' + licences.join(indiciaData.lang.reportFilters.orListJoin));
+        }
+        if ($('#media_licences :checked').length > 0 && $('#media_licences :checked').length < 3) {
+          let licences = [];
+          $.each($('#media_licences :checked'), function() {
+            licences.push($('label[for="' + this.id + '"]').text().toLowerCase());
+          });
+          r.push(indiciaData.lang.reportFilters.mediaLicenceIs + ' ' + licences.join(indiciaData.lang.reportFilters.orListJoin));
+        }
+        if (filterDef.coordinate_precision) {
+          const op = {
+            '<=': indiciaData.lang.reportFilters.sameAsOrBetterThan,
+            '>': indiciaData.lang.reportFilters.worseThan,
+            '=': indiciaData.lang.reportFilters.equalTo,
+          }[filterDef.coordinate_precision_op ? filterDef.coordinate_precision_op : '<='];
+          r.push(indiciaData.lang.reportFilters.coordinatePrecisionIs + ' ' + op + ' ' + (filterDef.coordinate_precision / 1000) + 'km');
+        }
+        // @todo Block saving a filter with zero licence boxes ticked
         return r.join(sep);
       },
     },
@@ -776,38 +872,15 @@ jQuery(document).ready(function ($) {
           $('#controls-filter_where legend').show();
         }
       },
-      loadFilter: function () {
-        var filter;
-        var map;
-        var locationsToLoad;
-        if (typeof indiciaData.mapdiv !== 'undefined') {
-          filter = indiciaData.filter.def;
-          map = indiciaData.mapdiv.map;
-          if (filter.searchArea) {
-            loadPolygon(filter.searchArea);
-          } else if (filter.location_id || filter.location_list || filter.indexed_location_id || filter.indexed_location_list) {
-            // need to load filter location boundaries onto map. Location_id variants are for legacy
-            if (filter.location_id && !filter.location_list) {
-              filter.location_list = filter.location_id;
-            }
-            if (filter.indexed_location_id && !filter.indexed_location_list) {
-              filter.indexed_location_list = filter.indexed_location_id;
-            }
-            locationsToLoad = filter.indexed_location_list ? filter.indexed_location_list : filter.location_list;
-            loadSites(locationsToLoad);
-          }
-        }
-      }
     },
     who: {
       loadForm: function (context) {
         if (context && context.my_records) {
           $('#my_records').prop('disabled', true);
           $('#controls-filter_who .context-instruct').show();
-          $('#controls-filter_who button').hide();
         } else {
           $('#my_records').prop('disabled', false);
-          $('#controls-filter_who button').show();
+          $('#controls-filter_who .context-instruct').hide();
         }
       }
     },
@@ -821,36 +894,92 @@ jQuery(document).ready(function ($) {
     },
     quality: {
       loadForm: function (context) {
+        // Disable quality options if defined by context.
         if (context && context.quality && context.quality !== 'all') {
-          $('#quality-filter').prop('disabled', true);
+          $('.quality-filter').prop('disabled', true);
         } else {
-          $('#quality-filter').prop('disabled', false);
+          $('.quality-filter').prop('disabled', false);
+        }
+        $('.quality-filter').val(indiciaData.filterParser.quality.statusDescriptionFromFilter(
+          indiciaData.filter.def.quality, indiciaData.filter.def.quality_op));
+        if (context) {
+          // If certainty context length is 4, all options are ticked so no need to disable.
+          if (context.certainty) {
+            if (context.certainty.split(',').length !== 4) {
+              $('[name="certainty\[\]"]').prop('disabled', true);
+            } else {
+              $('[name="certainty\[\]"]').prop('disabled', false);
+            }
+          }
+          if (context.autochecks) {
+            $('#autochecks').prop('disabled', true);
+          } else {
+            $('#autochecks').prop('disabled', false);
+          }
+          if (context.identification_difficulty) {
+            $('#identification_difficulty').prop('disabled', true);
+            $('#identification_difficulty_op').prop('disabled', true);
+          } else {
+            $('#identification_difficulty').prop('disabled', false);
+            $('#identification_difficulty_op').prop('disabled', false);
+          }
+          if (context.has_photos) {
+            $('#has_photos').prop('disabled', true);
+          } else {
+            $('#has_photos').prop('disabled', false);
+          }
+          if (context.coordinate_precision) {
+            $('#coordinate_precision_op').prop('disabled', true);
+            $('#coordinate_precision').prop('disabled', true);
+          } else {
+            $('#coordinate_precision_op').prop('disabled', false);
+            $('#coordinate_precision').prop('disabled', false);
+          }
+          if ((context.quality && context.quality !== 'all') ||
+              (context.certainty && context.certainty.split(',').length !== 4) ||
+              context.autochecks || context.identification_difficulty || context.has_photos ||
+              context.licences || context.media_licences || context.coordinate_precision
+            ) {
+            $('#controls-filter_quality .context-instruct').show();
+          }
         }
-        if (context && context.autochecks) {
-          $('#autochecks').prop('disabled', true);
-          // Autocheck context also blocks use of individual rule filters.
-          $('#autocheck_rule').prop('disabled', true);
-        } else {
-          $('#autochecks').prop('disabled', false);
-          $('#autocheck_rule').prop('disabled', context && context.autocheck_rule);
+        // If no licences are selected, tick them all as that's the unfiltered
+        // state.
+        if (!indiciaData.filter.def.licences) {
+          $('#licences :checkbox').prop('checked', true);
         }
-        if (context && context.identification_difficulty) {
-          $('#identification_difficulty').prop('disabled', true);
-          $('#identification_difficulty_op').prop('disabled', true);
-        } else {
-          $('#identification_difficulty').prop('disabled', false);
-          $('#identification_difficulty_op').prop('disabled', false);
+        if (!indiciaData.filter.def.media_licences) {
+          $('#media_licences :checkbox').prop('checked', true);
         }
-        if (context && context.has_photos) {
-          $('#has_photos').prop('disabled', true);
-        } else {
-          $('#has_photos').prop('disabled', false);
+        if (!indiciaData.filter.def.coordinate_precision) {
+          // If no coordinate precision selected, tick the not filtered option.
+          $('#coordinate_precision_op input').prop('checked', false);
+          $('#coordinate_precision input[value=""]').prop('checked', true);
         }
-        if (context && ((context.quality && context.quality !== 'all') ||
-          context.autochecks || context.autocheck_rule || context.identification_difficulty || context.has_photos)) {
-          $('#controls-filter_quality .context-instruct').show();
+        else if (!indiciaData.filter.def.coordinate_precision) {
+          // Precision in filter, but not the op, so set a default.
+          $('#coordinate_precision_op input[value="<="]').prop('checked', true);
         }
-      }
+        // Trigger change to update hidden controls in UI.
+        $('#autochecks').change();
+      },
+      applyFormToDefinition: function() {
+        // Map the checked boxes to a comma-separated value.
+        const checkedStatuses = $('.filter-controls .quality-pane input[type="checkbox"]:checked');
+        let statusCodes = [];
+        $.each(checkedStatuses, function () {
+          statusCodes.push($(this).val());
+        });
+        indiciaData.filter.def.quality = statusCodes.filter(function(value) {
+          if (value !== 'all' & statusCodes.indexOf('all') >= 0) {
+            return false;
+          }
+          if (value.match(/^[RV][1245]$/) && statusCodes.indexOf(value.substring(0, 1)) >= 0) {
+            return false;
+          }
+          return true;
+        }).join(',');
+      },
     },
     source: {
       loadForm: function (context) {
@@ -949,6 +1078,21 @@ jQuery(document).ready(function ($) {
     });
   });
 
+  // Show all taxon groups link.
+  $('#show-species-groups').click(function() {
+    $('.filter-controls').hide();
+    let cntr = $('<div>').insertAfter($('.filter-controls'));
+    let ul = $('<ul style="columns: 4">').appendTo(cntr);
+    $.each(indiciaData.allTaxonGroups, function() {
+      ul.append('<li>' + this.title + '</li>');
+    });
+    let btn = $('<button class="btn btn-primary">' + indiciaData.lang.reportFilters.back + '</button>').appendTo(cntr);
+    btn.click(function() {
+      cntr.remove();
+      $('.filter-controls').show();
+    });
+  });
+
   function clearSites(all) {
     var map = indiciaData.mapdiv.map;
     $('#location_list\\:sublist').children().remove();
@@ -989,6 +1133,7 @@ jQuery(document).ready(function ($) {
       data: 'mode=json&view=list&orderby=name&auth_token=' + indiciaData.read.auth_token +
       '&nonce=' + indiciaData.read.nonce + '&query=' + idQuery + '&view=detail&callback=?',
       success: function (data) {
+        // @todo Update this code to also work with the ES Leaflet map.
         var features = [];
         var feature;
         var geomwkt;
@@ -1055,9 +1200,9 @@ jQuery(document).ready(function ($) {
 
   $('#my_groups').click(function () {
     $.each(indiciaData.myGroups, function(idx, group) {
-      if ($('#taxon_group_list\\:sublist input[value=' + group[0] + ']').length === 0) {
-        $('#taxon_group_list\\:sublist').append('<li><span class="ind-delete-icon"> </span>' + group[1] +
-          '<input type="hidden" value="' + group[0] + '" name="taxon_group_list[]"></li>');
+      if ($('#taxon_group_list\\:sublist input[value=' + group['id'] + ']').length === 0) {
+        $('#taxon_group_list\\:sublist').append('<li><span class="ind-delete-icon"> </span>' + group['title'] +
+          '<input type="hidden" value="' + group['id'] + '" name="taxon_group_list[]"></li>');
       }
     });
   });
@@ -1103,8 +1248,10 @@ jQuery(document).ready(function ($) {
         obj.refreshFilter();
       }
     });
-    //Ensure that any other quality-filter controls on the page are kept in line
-    $('.standalone-quality-filter select').val(indiciaData.filter.def.quality);
+    //Ensure that any other quality-filter controls on the page are kept in line.
+    $('.quality-filter').val(indiciaData.filterParser.quality.statusDescriptionFromFilter(
+      indiciaData.filter.def.quality, indiciaData.filter.def.quality_op));
+    $('.standalone-media-filter select').val(indiciaData.filter.def.has_photos);
   };
 
   function codeToSharingTerm(code) {
@@ -1195,7 +1342,7 @@ jQuery(document).ready(function ($) {
     // clear any sublists
     $('.ind-sub-list li').remove();
     indiciaFns.updateFilterDescriptions();
-    $('#filter-build').html(indiciaData.lang.reportFilters.CreateAFilter);
+    $('#filter-build').html(indiciaData.lang.reportFilters.createAFilter);
     $('#filter-reset').addClass('disabled');
     $('#filter-delete').addClass('disabled');
     $('#filter-apply').addClass('disabled');
@@ -1230,6 +1377,12 @@ jQuery(document).ready(function ($) {
     indiciaData.filter.id = data[0].id;
     indiciaData.filter.title = data[0].title;
     $('#filter\\:title').val(data[0].title);
+    $.each($('#filter-panes .pane'), function (idx, pane) {
+      var name = pane.id.replace(/^pane-filter_/, '');
+      if (indiciaData.filterParser[name].fixLegacyFilter) {
+        indiciaData.filterParser[name].fixLegacyFilter(indiciaData.filter.def);
+      }
+    });
     indiciaFns.applyFilterToReports();
     $('#filter-reset').removeClass('disabled');
     $('#filter-delete').removeClass('disabled');
@@ -1241,7 +1394,7 @@ jQuery(document).ready(function ($) {
       }
     });
     indiciaFns.updateFilterDescriptions();
-    $('#filter-build').html(indiciaData.lang.reportFilters.ModifyFilter);
+    $('#filter-build').html(indiciaData.lang.reportFilters.modifyFilter);
     $('#standard-params .header span.changed').hide();
     // can't delete a filter you didn't create.
     if (data[0].created_by_id === indiciaData.user_id || indiciaData.admin === "1") {
@@ -1255,38 +1408,38 @@ jQuery(document).ready(function ($) {
     var def;
     filterOverride = getParams;
     if ($('#standard-params .header span.changed:visible').length === 0
-        || confirm(indiciaData.lang.reportFilters.ConfirmFilterChangedLoad)) {
+        || confirm(indiciaData.lang.reportFilters.confirmFilterChangedLoad)) {
       def = false;
       switch (id) {
         case 'all-records':
           def = '{"quality": "all"}';
           break;
         case 'my-records':
-          def = '{"quality": "all", "my_records": 1}';
+          def = '{"quality": "all", "my_records": "1"}';
           break;
         case 'my-queried-records':
-          def = '{"quality": "D", "my_records": 1}';
+          def = '{"quality": "D", "my_records": "1"}';
           break;
         case 'my-queried-or-not-accepted-records':
         case 'my-queried-rejected-records':
-          def = '{"quality": "DR", "my_records": 1}';
+          def = '{"quality": "D,R", "my_records": "1"}';
           break;
         case 'my-not-reviewed-records':
         case 'my-pending-records':
-          def = '{"quality": "P", "my_records": 1}';
+          def = '{"quality": "P", "my_records": "1"}';
           break;
         case 'my-accepted-records':
         case 'my-verified-records':
-          def = '{"quality": "V", "my_records": 1}';
+          def = '{"quality": "V", "my_records": "1"}';
           break;
         case 'my-groups':
-          def = '{"quality": "all", "my_records": 0, "taxon_group_list": ' + indiciaData.userPrefsTaxonGroups + '}';
+          def = '{"quality": "all", "my_records": "", "taxon_group_list": ' + indiciaData.userPrefsTaxonGroups + '}';
           break;
         case 'my-locality':
-          def = '{"quality": "all", "my_records": 0, "indexed_location_id": ' + indiciaData.userPrefsLocation + '}';
+          def = '{"quality": "all", "my_records": "", "indexed_location_id": ' + indiciaData.userPrefsLocation + '}';
           break;
         case 'my-groups-locality':
-          def = '{"quality": "all", "my_records": 0, "taxon_group_list": ' + indiciaData.userPrefsTaxonGroups +
+          def = '{"quality": "all", "my_records": "", "taxon_group_list": ' + indiciaData.userPrefsTaxonGroups +
             ', "indexed_location_id": ' + indiciaData.userPrefsLocation + '}';
           break;
         case 'queried-records':
@@ -1359,7 +1512,7 @@ jQuery(document).ready(function ($) {
     var attrName;
     var option;
     // regexp extracts the pane ID from the href. Loop through the controls in the pane
-    $.each(pane.find(':input').not('#imp-sref-system,:checkbox,[type=button],[name="location_list[]"],.precise-date-picker'),
+    $.each(pane.find(':input').not('#imp-sref-system,:checkbox,:radio,[type=button],[name="location_list[]"],.precise-date-picker'),
       function (idx, ctrl) {
         var value;
         // set control value to the stored filter setting
@@ -1381,6 +1534,10 @@ jQuery(document).ready(function ($) {
         }
       }
     );
+    $.each(pane.find('[type="radio"]'), function (idx, ctrl) {
+      $(ctrl).prop('checked', typeof indiciaData.filter.def[$(ctrl).attr('name')] !== 'undefined'
+            && indiciaData.filter.def[$(ctrl).attr('name')] === $(ctrl).val());
+    });
     $.each(pane.find(':checkbox'), function (idx, ctrl) {
       var tokens;
       var type;
@@ -1394,9 +1551,16 @@ jQuery(document).ready(function ($) {
           $(ctrl).prop('checked', $.inArray($(ctrl).val(), ids) > -1);
         }
       } else {
-        // other checkboxes are simple on/off flags for filter parameters.
-        $(ctrl).prop('checked', typeof indiciaData.filter.def[$(ctrl).attr('name')] !== 'undefined'
-          && indiciaData.filter.def[$(ctrl).attr('name')] === $(ctrl).val());
+        if ($(ctrl).attr('name').match(/\[\]$/) && typeof indiciaData.filter.def[$(ctrl).attr('name').replace('[]', '')] !== 'undefined') {
+          // An array mapped to a set of checkboxes.
+          var field = $(ctrl).attr('name').replace('[]', '');
+          var checkValues = indiciaData.filter.def[field].split(',');
+          $(ctrl).prop('checked', checkValues.indexOf($(ctrl).val()) !== -1);
+        } else {
+          // other checkboxes are simple on/off flags for filter parameters.
+          $(ctrl).prop('checked', typeof indiciaData.filter.def[$(ctrl).attr('name')] !== 'undefined'
+            && indiciaData.filter.def[$(ctrl).attr('name')] === $(ctrl).val());
+        }
       }
     });
   }
@@ -1512,7 +1676,7 @@ jQuery(document).ready(function ($) {
     if ($(e.currentTarget).hasClass('disabled')) {
       return;
     }
-    if (confirm(indiciaData.lang.reportFilters.ConfirmFilterDelete.replace('{title}', indiciaData.filter.title))) {
+    if (confirm(indiciaData.lang.reportFilters.confirmFilterDelete.replace('{title}', indiciaData.filter.title))) {
       filter = {
         id: indiciaData.filter.id,
         website_id: indiciaData.website_id,
@@ -1523,7 +1687,7 @@ jQuery(document).ready(function ($) {
         filter,
         function (data) {
           if (typeof data.error === 'undefined') {
-            alert(indiciaData.lang.reportFilters.FilterDeleted);
+            alert(indiciaData.lang.reportFilters.filterDeleted);
             $('#select-filter').val('');
             $('#select-filter').find('option[value="' + indiciaData.filter.id + '"]').remove();
             resetFilter();
@@ -1606,9 +1770,11 @@ jQuery(document).ready(function ($) {
     }
     $(e.currentTarget).find('.fb-apply').data('clicked', true);
     // persist each control value into the stored settings
-    $.each($(e.currentTarget).find(':input[name]'), function (idx, ctrl) {
-      if (!$(ctrl).hasClass('olButton')) { // skip open layers switcher
-        if ($(ctrl).attr('type') !== 'checkbox' || $(ctrl).is(':checked')) {
+    $.each($(e.currentTarget).find(':input[name]').not('.filter-exclude'), function (idx, ctrl) {
+      // Skip open layers switcher.
+      if (!$(ctrl).hasClass('olButton')) {
+        // Skip radio/checkboxes unless checked.
+        if (($(ctrl).attr('type') !== 'checkbox' && $(ctrl).attr('type') !== 'radio') || $(ctrl).is(':checked')) {
           // array control?
           if ($(ctrl).attr('name').match(/\[\]$/)) {
             // store array control data to handle later
@@ -1621,9 +1787,6 @@ jQuery(document).ready(function ($) {
             // normal control
             indiciaData.filter.def[$(ctrl).attr('name')] = $(ctrl).val();
           }
-        } else {
-          // an unchecked checkbox so clear it's value
-          indiciaData.filter.def[$(ctrl).attr('name')] = '';
         }
       }
     });
@@ -1685,7 +1848,7 @@ jQuery(document).ready(function ($) {
       function (data) {
         var handled;
         if (typeof data.error === 'undefined') {
-          alert(indiciaData.lang.reportFilters.FilterSaved);
+          alert(indiciaData.lang.reportFilters.filterSaved);
           indiciaData.filter.id = data.outer_id;
           indiciaData.filter.title = $('#filter\\:title').val();
           $('#active-filter-label').html('Active filter: ' + $('#filter\\:title').val());
@@ -1704,7 +1867,7 @@ jQuery(document).ready(function ($) {
           if (typeof data.errors !== 'undefined') {
             $.each(data.errors, function (key, msg) {
               if (msg.indexOf('duplicate') > -1) {
-                if (confirm(indiciaData.lang.reportFilters.FilterExistsOverwrite)) {
+                if (confirm(indiciaData.lang.reportFilters.filterExistsOverwrite)) {
                   // need to load the existing filter to get it's ID, then resave
                   $.getJSON(indiciaData.read.url + 'index.php/services/data/filter?created_by_id=' +
                     indiciaData.user_id + '&title=' + encodeURIComponent($('#filter\\:title').val()) + '&sharing=' +
@@ -1724,22 +1887,29 @@ jQuery(document).ready(function ($) {
           }
         }
         saving = false;
-        $('#filter-build').html(indiciaData.lang.reportFilters.ModifyFilter);
+        $('#filter-build').html(indiciaData.lang.reportFilters.modifyFilter);
         $('#filter-reset').removeClass('disabled');
       },
       'json'
     );
   };
 
-  // Standalone quality filter select change event
-  $('.standalone-quality-filter select').change(function() {
-    indiciaData.filter.def.quality= $(this).val();
+  /**
+   * Refresh after a standalone filter control changed.
+   */
+  function updateStandaloneFilter() {
     // If there is a standard params control update the quality drop-down to reflect
     // the value selected in this control.
     indiciaFns.updateFilterDescriptions();
     filterParamsChanged();
     // Update reports
     indiciaFns.applyFilterToReports();
+  }
+
+  // Standalone quality media filters select change event.
+  $('.standalone-media-filter select').change(function() {
+    indiciaData.filter.def.has_photos = $(this).val();
+    updateStandaloneFilter();
   });
 
   // Interactions betweem mutually exclusive filters.
@@ -2018,4 +2188,180 @@ jQuery(document).ready(function ($) {
   $('#surveys-search').keyup(sourceListFilterKeyHandler);
   $('#input_forms-search').keyup(sourceListFilterKeyHandler);
 
+  /* Code for the custom quality filter select control. */
+  function closeQualityPane(e) {
+    const clickedOn = $(e.target);
+    if ((clickedOn.is('button') || !clickedOn.closest('.quality-pane').length) && $('.quality-pane').is(':visible')) {
+      $('.quality-pane').hide();
+      document.removeEventListener('click', closeQualityPane);
+    }
+  }
+
+  /**
+   * OK button handler for the quality pane.
+   */
+  function saveAndCloseQualityPane(e) {
+    const pane = $(e.currentTarget).closest('.quality-pane');
+    const checkedStatuses = $(pane).find('input[type="checkbox"]:checked');
+    let statusCodes = [];
+    $.each(checkedStatuses, function () {
+      statusCodes.push($(this).val());
+    });
+    $('input.quality-filter').val(indiciaData.filterParser.quality.statusDescriptionFromFilter(statusCodes, $('[name="quality_op"]:checked').val()));
+    if ($(e.currentTarget).closest('.standalone-quality-filter').length !== 0) {
+      // If standalone, this updates the filter immediately.
+      indiciaData.filter.def.quality = statusCodes.filter(function(value) {
+        if (value !== 'all' & statusCodes.indexOf('all') >= 0) {
+          return false;
+        }
+        if (value.match(/^[RV][1245]$/) && statusCodes.indexOf(value.substring(0, 1)) >= 0) {
+          return false;
+        }
+        return true;
+      }).join(',');
+      indiciaData.filter.def.quality_op = $(pane).find('[name="quality_op"]:checked').val();
+      let desc = indiciaData.filterParser.quality.getDescription(indiciaData.filter.def, '<br/>');
+      if (desc === '') {
+        desc = indiciaData.lang.reportFiltersNoDescription[name];
+      }
+      $('#pane-filter_quality span.filter-desc').html(desc);
+      updateStandaloneFilter();
+    }
+    closeQualityPane(e);
+  }
+
+  // Show the custom quality panel drop-down div.
+  $('.quality-filter').click(function(e) {
+    var wrap = $(e.currentTarget).closest('.quality-cntr');
+    var pane = wrap.find('.quality-pane');
+    var input = wrap.find('.quality-filter');
+    var inputPos = input.position();
+    var inputHeight = input.outerHeight();
+    if (pane.is(':visible')) {
+      closeQualityPane(e);
+    } else {
+      // If a standalone, need to load the currrent filter into the controls.
+      if ($(e.currentTarget).closest('.standalone-quality-filter').length > 0) {
+        const inChecked = typeof indiciaData.filter.def.quality_op === 'undefined' || indiciaData.filter.def.quality_op === 'in';
+        // Include.
+        $('#quality_op--standalone\\:0').prop('checked', inChecked);
+        // Exclude.
+        $('#quality_op--standalone\\:1').prop('checked', !inChecked);
+        // Statuses
+        const statuses = indiciaData.filter.def.quality.split(',');
+        $('.quality-pane input[type="checkbox"]').prop('checked', false);
+        $.each(statuses, function() {
+          $('.quality-pane input[type="checkbox"][value="' + this + '"]').prop('checked', true);
+        });
+      }
+      // Adjust for select control margin.
+      $(pane).css('top', (inputPos.top + inputHeight + parseInt( + $(input).css('margin-top').replace('px', ''), 10)) + 'px');
+      $(pane).css('left', inputPos.left + parseInt($(input).css('margin-left').replace('px', ''), 10) + 'px');
+      pane.show();
+      document.addEventListener('click', closeQualityPane);
+    }
+    e.preventDefault();
+    return false;
+  });
+
+  // Indent level 2 verification items hierarchical behaviour.
+  $('.quality-pane').find('input[value="V1"], input[value="V2"], input[value="R4"], input[value="R5"]').addClass('indent');
+  $('.quality-pane input.indent').change((e) => {
+    const pane = $(e.currentTarget).closest('.quality-pane');
+    const status = $(e.currentTarget).val().substring(0, 1);
+    const l1Checkbox = $(pane).find('input[value="' + status + '"]');
+    const l2Checkboxes = $(pane).find('input.indent[value^="' + status + '"]');
+    const l2CheckboxesChecked = $(pane).find('input.indent[value^="' + status + '"]:checked');
+    l1Checkbox.prop('checked', l2Checkboxes.length === l2CheckboxesChecked.length);
+  });
+
+  /**
+   * Cascade level-1 status checkboxes to level 2, e.g. V ticks V1 and V2.
+   */
+  $('.quality-pane').find('input[value="V"], input[value="R"]').change((e) => {
+    const pane = $(e.currentTarget).closest('.quality-pane');
+    const status = $(e.currentTarget).val();
+    const l1Checkbox = $(pane).find('input[value="' + status + '"]');
+    const l2Checkboxes = $(pane).find('input.indent[value^="' + status + '"]');
+    l2Checkboxes.prop('checked', l1Checkbox.is(':checked'));
+  });
+
+  /**
+   * Cascade ticking all to the other checkboxes.
+   */
+  $('.quality-pane').find('input[value="all"]').change((e) => {
+    const pane = $(e.currentTarget).closest('.quality-pane');
+    const checkboxes = $(pane).find('input[type="checkbox"]').not('[value="all"]');
+    checkboxes.prop('checked', $(e.currentTarget).is(':checked'));
+  });
+
+  /**
+   * Uncheck all if another checkbox is unchecked.
+   */
+  $('.quality-pane').find('input[type="checkbox"]').not('[value="all"]').change((e) => {
+    if (!$(e.currentTarget).is(':checked')) {
+      const pane = $(e.currentTarget).closest('.quality-pane');
+      const allCheckbox = $(pane).find('input[type="checkbox"][value="all"]');
+      $(allCheckbox).prop('checked', false);
+    }
+  });
+
+  $('#identification_difficulty').change(function() {
+    if ($('#identification_difficulty').val() === '') {
+      // Unsetting the ID diff filter, so set the op to = as makes more sense.
+      $('#identification_difficulty_op').val('=');
+    }
+  });
+
+  $('#coordinate_precision_op').change(function() {
+    if ($('#coordinate_precision_op input:checked').length > 0 && $('#coordinate_precision input:checked').val() === '') {
+      // Setting a coordinate precision op, so set the default precision to 1km
+      // if not already set.
+      $('#coordinate_precision input[value="1000"]').prop('checked', true);
+    }
+  });
+
+  $('#coordinate_precision').change(function() {
+    if ($('#coordinate_precision input:checked').val() === '') {
+      // Unsetting the coord precision filter, so remove the op.
+      $('#coordinate_precision_op input').prop('checked', false);
+    }
+    else if ($('#coordinate_precision_op input:checked').length === 0) {
+      // Setting a coordinate precision, so set the default op to <= if not
+      // already set.
+      $('#coordinate_precision_op input[value="<="]').prop('checked', true);
+    }
+  });
+
+
+  $('#controls-filter_quality form').validate({
+    rules: {
+      "licences[]": {
+        required: true,
+        minlength: 1
+      },
+      "media_licences[]": {
+        required: true,
+        minlength: 1
+      }
+    },
+    messages: {
+      "licences[]": indiciaData.lang.reportFilters.cannotDeselectAllLicences,
+      "media_licences[]": indiciaData.lang.reportFilters.cannotDeselectAllMediaLicences,
+    },
+    errorPlacement: function(error, element) {
+      var placement = $(element).closest('.control-box');
+      if (placement) {
+        $(placement).append(error)
+      } else {
+        error.insertAfter(element);
+      }
+    },
+    errorClass: indiciaData.templates.jQueryValidateErrorClass,
+  });
+
+  $('.quality-pane button.cancel').click(closeQualityPane);
+
+  $('.quality-pane button.ok').click(saveAndCloseQualityPane);
+
 });
\ No newline at end of file
diff --git a/js/uploader.js b/js/uploader.js
index 425a5c2a..bebd03cd 100644
--- a/js/uploader.js
+++ b/js/uploader.js
@@ -266,6 +266,177 @@ jQuery(document).ready(function($) {
     $(this).attr('name', $(this).attr('name').replace(/-unrestricted$/, ''));
   });
 
+  /**
+   * Map import columns page code.
+   */
+
+  /**
+   * Tests if a required field key is covered by one of the global values.
+   *
+   * @param string
+   *   Key to check.
+   */
+  function inGlobalValues(key) {
+    // If there are several options of how to search a single lookup then they
+    // are identified by a 3rd token, e.g. occurrence:fk_taxa_taxon_list:search_code.
+    // These cases fulfil the needs of a required field so we can remove them.
+    var fieldTokens = key.split(':');
+    var found;
+    var parts;
+    if (fieldTokens.length > 2) {
+      fieldTokens.pop();
+      key = fieldTokens.join(':');
+    }
+    found = typeof indiciaData.globalValues[key] !== 'undefined';
+    // Global values also works if not entity specific.
+    parts = key.split(':');
+    if (parts.length > 1) {
+      found = found || typeof indiciaData.globalValues[parts[1]] !== 'undefined';
+    }
+    return found;
+  }
+
+  /**
+   * Ensure groups of related fields are complete.
+   *
+   * E.g. date type, date start and date end are all required if one present.
+   * Adds warnings to the UI if incomplete groups found.
+   */
+  function checkGroupsOfRelatedFields() {
+    // Regexes for fields where if one mapping is present, others are required.
+    const groupedFields = [
+      '^occurrence:fk_taxa_taxon_list:(genus|specific)$',
+      ':date_(type|start|end)$'
+    ];
+    let messages = [];
+    // First, check if any required checkbox is for a field in a field
+    // group where checking 1 means the others are also required.
+    $.each(groupedFields, function() {
+      let matchExpr = new RegExp(this);
+      const ticked = $('.mapped-field option:selected').filter(function() {
+        return this.value.match(matchExpr);
+      });
+      if (ticked.length > 0) {
+        const shouldTick = $('.mapped-field:first option').filter(function() {
+          return this.value.match(matchExpr);
+        });
+        if (shouldTick.length > ticked.length) {
+          const tickedArr = $.map(ticked, el => [el.text]);
+          const shouldTickArr = $.map(shouldTick, el => [el.text]);
+          const missing = shouldTickArr.filter(value => !tickedArr.includes(value));
+
+          messages.push('<p>' +
+            indiciaData.lang.import_helper_2.incompleteFieldGroupSelected
+              .replace('{1}', '<ul>' + $.map(tickedArr, label => '<li>' + label + '</li>').join('') + '</ul>') +
+            indiciaData.lang.import_helper_2.incompleteFieldGroupRequired
+              .replace('{2}', '<ul>' + $.map(missing, label => '<li>' + label + '</li>').join('') + '</ul>') +
+          '</p>');
+        }
+      }
+    });
+    if (messages.length) {
+      $('#required-messages').html(messages.join('<br/>'));
+      $('#required-messages').fadeIn();
+    } else {
+      $('#required-messages').fadeOut();
+    }
+  }
+
+  /**
+   * Check that required fields are mapped. Set checkbox ticked state in UI.
+   */
+  function checkRequiredFields() {
+    checkGroupsOfRelatedFields();
+    $.each($('.required-checkbox'), function() {
+      var checkbox = $(this);
+      var checkboxKeyList = checkbox.data('key');
+      var foundInMapping = false;
+      // When there is a choice of one of several, keys are separated by '|'.
+      var keys = checkboxKeyList.split('|');
+      $.each(keys, function() {
+        // Field can be populated from global values.
+        var foundInGlobalValues = inGlobalValues(this);
+        // *_id global values fill in FK fields.
+        if (this.match(/\bfk_/)) {
+          foundInGlobalValues = foundInGlobalValues || inGlobalValues(this.replace(/\bfk_/, '') + '_id');
+        }
+        // No need to show required fields that are filled in by global values
+        // at this point.
+        if (foundInGlobalValues) {
+          $(checkbox).closest('li').hide();
+        }
+        // Or field can be populated by a mapping. A 2 part required field
+        // (table:field) can be fulfilled by a 3 part mapped field
+        // (table:field:subtype), e.g.
+        // occurrence:fk_taxa_taxon_list:searchcode.
+        foundInMapping = foundInMapping
+          || $('.mapped-field option:selected[value="' + this + '"]').length > 0
+          || $('.mapped-field option:selected[value^="' + this + ':"]').length > 0;
+        // Date field is a special case that can be fulfulled by date_start,
+        // date_end and date_type.
+        foundInMapping = foundInMapping || (this.match(/:date$/)
+          && $('.mapped-field option:selected[value="' + this + '_start"]').length > 0
+          && $('.mapped-field option:selected[value="' + this + '_end"]').length > 0
+          && $('.mapped-field option:selected[value="' + this + '_type"]').length > 0);
+      });
+      if (foundInMapping) {
+        $(checkbox).removeClass('fa-square');
+        $(checkbox).addClass('fa-check-square');
+      } else {
+        $(checkbox).removeClass('fa-check-square');
+        $(checkbox).addClass('fa-square');
+      }
+    });
+    $('input[type="submit"]').attr('disabled', $('.required-checkbox.fa-square:visible').length > 0);
+    // Also disable the standard/advanced selector.
+    const onlyStandardFieldsSelected = $('option.advanced:selected').length === 0;
+    if (onlyStandardFieldsSelected) {
+      $('[name="field-type-toggle"]').removeAttr('disabled');
+      $('.field-type-selector').removeClass('disabled');
+    } else {
+      $('[name="field-type-toggle"]').attr('disabled', true);
+      $('.field-type-selector').addClass('disabled');
+      $('[name="field-type-toggle"][value="advanced"]').attr('checked', true);
+    }
+  }
+
+  /**
+   * Click a link on the suggested column mappings auto-selects the option.
+   */
+  function applySuggestion(e) {
+    $(e.currentTarget).closest('td').find('option[value="' + $(e.currentTarget).data('value') + '"]').prop('selected', true);
+    checkRequiredFields();
+  }
+
+  /**
+   * Either show just standard import fields, or also show advanced.
+   *
+   * Depending on mode. If advanced fields are hidden, the original HTML for the
+   * columns set is stored in a data attribute so it can be reset.
+   */
+  function showOrHideAdvancedFields() {
+    const standardFieldsMode = $('[name="field-type-toggle"]:checked').val() === 'standard';
+    const onlyStandardFieldsSelected = $('option.advanced:selected').length === 0;
+    if (standardFieldsMode && onlyStandardFieldsSelected) {
+      let parents = $('option.advanced').parents();
+      $('option.advanced').remove();
+      // Also remove parent option groups if now empty.
+      $.each(parents, function() {
+        if ($(this).find('option').length === 0) {
+          $(this).remove();
+        }
+      });
+    } else {
+      $.each($('select.mapped-field'), function() {
+        if (typeof indiciaData.fullImportFieldOptionsHtml !== 'undefined') {
+          let originalValue = $(this).val();
+          $(this).html(indiciaData.fullImportFieldOptionsHtml );
+          $(this).val(originalValue);
+        }
+      });
+    }
+  }
+
   /**
    * Lookup matching page code.
    */
@@ -745,134 +916,6 @@ jQuery(document).ready(function($) {
     });
   });
 
-  /**
-   * Tests if a required field key is covered by one of the global values.
-   *
-   * @param string
-   *   Key to check.
-   */
-  function inGlobalValues(key) {
-    // If there are several options of how to search a single lookup then they
-    // are identified by a 3rd token, e.g. occurrence:fk_taxa_taxon_list:search_code.
-    // These cases fulfil the needs of a required field so we can remove them.
-    var fieldTokens = key.split(':');
-    var found;
-    var parts;
-    if (fieldTokens.length > 2) {
-      fieldTokens.pop();
-      key = fieldTokens.join(':');
-    }
-    found = typeof indiciaData.globalValues[key] !== 'undefined';
-    // Global values also works if not entity specific.
-    parts = key.split(':');
-    if (parts.length > 1) {
-      found = found || typeof indiciaData.globalValues[parts[1]] !== 'undefined';
-    }
-    return found;
-  }
-
-  /**
-   * Ensure groups of related fields are complete.
-   *
-   * E.g. date type, date start and date end are all required if one present.
-   * Adds warnings to the UI if incomplete groups found.
-   */
-  function checkGroupsOfRelatedFields() {
-    // Regexes for fields where if one mapping is present, others are required.
-    const groupedFields = [
-      '^occurrence:fk_taxa_taxon_list:(genus|specific)$',
-      ':date_(type|start|end)$'
-    ];
-    let messages = [];
-    // First, check if any required checkbox is for a field in a field
-    // group where checking 1 means the others are also required.
-    $.each(groupedFields, function() {
-      let matchExpr = new RegExp(this);
-      const ticked = $('.mapped-field option:selected').filter(function() {
-        return this.value.match(matchExpr);
-      });
-      if (ticked.length > 0) {
-        const shouldTick = $('.mapped-field:first option').filter(function() {
-          return this.value.match(matchExpr);
-        });
-        if (shouldTick.length > ticked.length) {
-          const tickedArr = $.map(ticked, el => [el.text]);
-          const shouldTickArr = $.map(shouldTick, el => [el.text]);
-          const missing = shouldTickArr.filter(value => !tickedArr.includes(value));
-
-          messages.push('<p>' +
-            indiciaData.lang.import_helper_2.incompleteFieldGroupSelected
-              .replace('{1}', '<ul>' + $.map(tickedArr, label => '<li>' + label + '</li>').join('') + '</ul>') +
-            indiciaData.lang.import_helper_2.incompleteFieldGroupRequired
-              .replace('{2}', '<ul>' + $.map(missing, label => '<li>' + label + '</li>').join('') + '</ul>') +
-          '</p>');
-        }
-      }
-    });
-    if (messages.length) {
-      $('#required-messages').html(messages.join('<br/>'));
-      $('#required-messages').fadeIn();
-    } else {
-      $('#required-messages').fadeOut();
-    }
-  }
-
-  /**
-   * Check that required fields are mapped. Set checkbox ticked state in UI.
-   */
-  function checkRequiredFields() {
-    checkGroupsOfRelatedFields();
-    $.each($('.required-checkbox'), function() {
-      var checkbox = $(this);
-      var checkboxKeyList = checkbox.data('key');
-      var foundInMapping = false;
-      // When there is a choice of one of several, keys are separated by '|'.
-      var keys = checkboxKeyList.split('|');
-      $.each(keys, function() {
-        // Field can be populated from global values.
-        var foundInGlobalValues = inGlobalValues(this);
-        // *_id global values fill in FK fields.
-        if (this.match(/\bfk_/)) {
-          foundInGlobalValues = foundInGlobalValues || inGlobalValues(this.replace(/\bfk_/, '') + '_id');
-        }
-        // No need to show required fields that are filled in by global values
-        // at this point.
-        if (foundInGlobalValues) {
-          $(checkbox).closest('li').hide();
-        }
-        // Or field can be populated by a mapping. A 2 part required field
-        // (table:field) can be fulfilled by a 3 part mapped field
-        // (table:field:subtype), e.g.
-        // occurrence:fk_taxa_taxon_list:searchcode.
-        foundInMapping = foundInMapping
-          || $('.mapped-field option:selected[value="' + this + '"]').length > 0
-          || $('.mapped-field option:selected[value^="' + this + ':"]').length > 0;
-        // Date field is a special case that can be fulfulled by date_start,
-        // date_end and date_type.
-        foundInMapping = foundInMapping || (this.match(/:date$/)
-          && $('.mapped-field option:selected[value="' + this + '_start"]').length > 0
-          && $('.mapped-field option:selected[value="' + this + '_end"]').length > 0
-          && $('.mapped-field option:selected[value="' + this + '_type"]').length > 0);
-      });
-      if (foundInMapping) {
-        $(checkbox).removeClass('fa-square');
-        $(checkbox).addClass('fa-check-square');
-      } else {
-        $(checkbox).removeClass('fa-check-square');
-        $(checkbox).addClass('fa-square');
-      }
-    });
-    $('input[type="submit"]').attr('disabled', $('.required-checkbox.fa-square:visible').length > 0);
-  }
-
-  /**
-   * Click a link on the suggested column mappings auto-selects the option.
-   */
-  function applySuggestion(e) {
-    $(e.currentTarget).closest('td').find('option[value="' + $(e.currentTarget).data('value') + '"]').prop('selected', true);
-    checkRequiredFields();
-  }
-
   /**
    * Preprocessing page code.
    */
@@ -1163,6 +1206,10 @@ jQuery(document).ready(function($) {
     indiciaFns.on('change', '.mapped-field', {}, checkRequiredFields);
     indiciaFns.on('click', '.apply-suggestion', {}, applySuggestion);
     checkRequiredFields();
+    $('[name="field-type-toggle"]').change(showOrHideAdvancedFields);
+    // Capture the full field option HTML so selects can be reset as required.
+    indiciaData.fullImportFieldOptionsHtml = $('select.mapped-field:first').html();
+    showOrHideAdvancedFields();
   } else if (indiciaData.step === 'lookupMatchingForm') {
     // If on the lookup matching page, then trigger the process.
     logBackgroundProcessingInfo(indiciaData.lang.import_helper_2.findingLookupFieldsThatNeedMatching);
diff --git a/scss/common/_import-helper-2.scss b/scss/common/_import-helper-2.scss
index ab44dfd2..248f247f 100644
--- a/scss/common/_import-helper-2.scss
+++ b/scss/common/_import-helper-2.scss
@@ -129,4 +129,16 @@ div.choice-card {
   .card-name {
     font-weight: bold;
   }
+}
+div.inline {
+  * {
+    vertical-align: middle;
+  }
+  label {
+    margin-left: 4px;
+    margin-right: 8px;
+  }
+  &.disabled {
+    opacity: 0.7;
+  }
 }
\ No newline at end of file
diff --git a/scss/common/_report-filters.scss b/scss/common/_report-filters.scss
new file mode 100644
index 00000000..8c1800a1
--- /dev/null
+++ b/scss/common/_report-filters.scss
@@ -0,0 +1,39 @@
+/* Quality filter custom select */
+.quality-cntr {
+
+  #ctrl-wrap-quality {
+    position: relative;
+    overflow: visible;
+  }
+
+  /* Drop down quality pane */
+  .quality-pane {
+    box-shadow: 4px 4px calc(8px) #c7c7c7;
+    border: solid silver 1px;
+    border-radius: 4px;
+    background: white;
+    z-index: 1000;
+    position: absolute;
+    padding: 8px;
+    /* Include/Exclude inline */
+    #quality_op, #quality_op--standalone {
+      li {
+        display: inline-block;
+      }
+    }
+    input.indent {
+      margin-left: 30px !important;
+    }
+  }
+}
+
+/* Reset */
+#filter-bar .quality-pane .ctrl-wrap {
+  display: block;
+}
+
+.filter-popup {
+  button[type="submit"] {
+    margin-left: 8px;
+  }
+}
\ No newline at end of file
diff --git a/scss/generic/_bootstrapify.scss b/scss/generic/_bootstrapify.scss
index 728470c9..5b91c80c 100644
--- a/scss/generic/_bootstrapify.scss
+++ b/scss/generic/_bootstrapify.scss
@@ -171,4 +171,12 @@ progress.progress::-moz-progress-bar {
 .table {
   width: 100%;
   max-width: 100%;
+}
+
+.pull-right {
+  float: right;
+}
+
+.pull-left {
+  float: left;
 }
\ No newline at end of file
diff --git a/scss/generic/_verification.scss b/scss/generic/_verification.scss
new file mode 100644
index 00000000..f8132da9
--- /dev/null
+++ b/scss/generic/_verification.scss
@@ -0,0 +1,15 @@
+#redet-form {
+  .helpText {
+    margin: 0;
+  }
+  .form-control {
+    /* Allow space for required * */
+    width: 95%;
+  }
+  label {
+    width: auto;
+  }
+  input[type="checkbox"] {
+    margin: 10px 8px;
+  }
+}
\ No newline at end of file
diff --git a/scss/theme-bootstrap-3.scss b/scss/theme-bootstrap-3.scss
index 0401ec74..a38c38b2 100644
--- a/scss/theme-bootstrap-3.scss
+++ b/scss/theme-bootstrap-3.scss
@@ -6,6 +6,7 @@
 @import "common/toggle-slider";
 @import "common/sort-handle";
 @import "common/map-controls";
+@import "common/report-filters";
 @import "common/report-grid";
 @import "common/uploader";
 @import "common/media";
diff --git a/scss/theme-generic.scss b/scss/theme-generic.scss
index ed5bcb51..758c69ec 100644
--- a/scss/theme-generic.scss
+++ b/scss/theme-generic.scss
@@ -6,6 +6,7 @@
 @import "common/toggle-slider";
 @import "common/sort-handle";
 @import "common/map-controls";
+@import "common/report-filters";
 @import "common/report-grid";
 @import "common/uploader";
 @import "common/media";
@@ -19,4 +20,5 @@
 @import "common/ol2-map";
 @import "common/import-helper-2";
 @import "common/fancy-dialog";
-@import "generic/bootstrapify";
\ No newline at end of file
+@import "generic/bootstrapify";
+@import "generic/verification";
\ No newline at end of file