diff --git a/angular-legacy/shared/fieldClasses.ts b/angular-legacy/shared/fieldClasses.ts
index baee2869f1..9016c4e245 100644
--- a/angular-legacy/shared/fieldClasses.ts
+++ b/angular-legacy/shared/fieldClasses.ts
@@ -19,6 +19,7 @@ import {
   HtmlRawComponent
 } from './form/field-simple.component';
 import { RecordMetadataRetrieverField, RecordMetadataRetrieverComponent } from './form/record-meta.component';
+import { TimerField, TimerComponent } from './form/timer.component';
 import { VocabField, VocabFieldComponent } from './form/field-vocab.component';
 import { RepeatableContainer, RepeatableVocab, RepeatableContributor, RepeatableVocabComponent, RepeatableContributorComponent } from './form/field-repeatable.component';
 import { ContributorField, ContributorComponent } from './form/field-contributor.component';
@@ -67,6 +68,7 @@ export const fieldClasses=  {
   'MapField': {'meta': MapField, 'comp': MapComponent, 'lookupService': 'vocabFieldLookupService'},
   'ParameterRetriever':{ 'meta': ParameterRetrieverField, 'comp': ParameterRetrieverComponent},
   'RecordMetadataRetriever':{ 'meta': RecordMetadataRetrieverField, 'comp': RecordMetadataRetrieverComponent},
+  'Timer':{ 'meta': TimerField, 'comp': TimerComponent},
   'RelatedObjectSelector':{ 'meta': RelatedObjectSelectorField, 'comp': RelatedObjectSelectorComponent},
   'RelatedFileUpload':{ 'meta': RelatedFileUploadField, 'comp': RelatedFileUploadComponent},
   'DataLocation':{ 'meta': DataLocationField, 'comp': DataLocationComponent},
diff --git a/angular-legacy/shared/form/field-contributor.component.ts b/angular-legacy/shared/form/field-contributor.component.ts
index 15f58790fd..2da7dd73ab 100644
--- a/angular-legacy/shared/form/field-contributor.component.ts
+++ b/angular-legacy/shared/form/field-contributor.component.ts
@@ -98,6 +98,7 @@ export class ContributorField extends FieldBase<any> implements CustomValidation
 
     this.roles = options['roles'] || [];
     this.value = options['value'] || this.setEmptyValue();
+    
 
     this.activeValidators = options['activeValidators'];
 
@@ -143,6 +144,7 @@ export class ContributorField extends FieldBase<any> implements CustomValidation
       this.validators['family_name'] = [Validators.required];
       this.validators['given_name'] = [Validators.required];
     }
+    
     // Resolves: #605
     // now that we've set the default validators... we read the config to override
     if (!_.isEmpty(this.activeValidators)) {
@@ -158,6 +160,7 @@ export class ContributorField extends FieldBase<any> implements CustomValidation
         }
       });
     }
+    
     this.findRelationshipFor = options['findRelationshipFor'] || '';
     this.findRelationship = options['findRelationship'] || null;
     this.relationshipFor = options['relationshipFor'] || '';
@@ -214,6 +217,8 @@ export class ContributorField extends FieldBase<any> implements CustomValidation
     if (this.required) {
       this.enableValidators();
     } else {
+      // disable the validators otherwise they'll get enabled on show/hide
+      this.validators = {};
       // if splitting names, attach handler to individual input form control
       if (this.splitNames) {
         const reqFields = ['family_name', 'given_name'];
@@ -270,7 +275,6 @@ export class ContributorField extends FieldBase<any> implements CustomValidation
     } else {
       this.toggleConditionalValidation(!_.isEmpty(value.text_full_name));
     }
-
   }
 
   toggleConditionalValidation(hasValue) {
@@ -486,6 +490,68 @@ export class ContributorField extends FieldBase<any> implements CustomValidation
       });
     }
   }
+
+  public setVisibility(data, eventConf:any = {}) {
+    let newVisible = this.visible;
+    if (_.isArray(this.visibilityCriteria)) {
+      // save the value of this data in a map, so we can run complex conditional logic that depends on one or more fields
+      if (!_.isEmpty(eventConf) && !_.isEmpty(eventConf.srcName)) {
+        this.subscriptionData[eventConf.srcName] = data;
+      }
+      // only run the function set if we have all the data...
+      if (_.size(this.subscriptionData) == _.size(this.visibilityCriteria)) {
+        newVisible = true;
+        _.each(this.visibilityCriteria, (visibilityCriteria) => {
+          const dataEntry = this.subscriptionData[visibilityCriteria.fieldName];
+          newVisible = newVisible && this.execVisibilityFn(dataEntry, visibilityCriteria);
+        });
+
+      }
+    } else
+    if (_.isObject(this.visibilityCriteria) && _.get(this.visibilityCriteria, 'type') == 'function') {
+      newVisible = this.execVisibilityFn(data, this.visibilityCriteria);
+    } else {
+      newVisible = _.isEqual(data, this.visibilityCriteria);
+    }
+    const that = this;
+    setTimeout(() => {
+      if (!newVisible) {
+        if (that.visible) {
+          // remove validators
+          if (that.formModel) {
+            if(that['disableValidators'] != null && typeof(that['disableValidators']) == 'function') {
+              that['disableValidators']();
+            } else {
+              that.formModel.clearValidators();
+            }
+            that.formModel.updateValueAndValidity();
+            
+          }
+        }
+      } else {
+        if (!that.visible) {
+          // restore validators
+          if (that.formModel) {       
+              if(that['enableValidators'] != null && typeof(that['enableValidators']) == 'function') {
+                that['enableValidators']();
+              } else {
+                that.formModel.setValidators(that.validators);
+              }
+              setTimeout(() => {
+                that.setValue(that.formModel.value,false,true)
+              });
+              that.formModel.updateValueAndValidity();
+          }
+        }
+      }
+      that.visible = newVisible;
+    });
+    if(eventConf.returnData == true) {
+      return data;
+    }
+    
+  }
+
 }
 
 @Component({
diff --git a/angular-legacy/shared/form/field-map.component.ts b/angular-legacy/shared/form/field-map.component.ts
index 47cbab2ed1..37e1da083d 100644
--- a/angular-legacy/shared/form/field-map.component.ts
+++ b/angular-legacy/shared/form/field-map.component.ts
@@ -22,11 +22,11 @@ import { FieldBase } from './field-base';
 import { FormGroup, FormControl, Validators } from '@angular/forms';
 import * as _ from "lodash";
 import { RecordsService } from './records.service';
-import {  Map,  GeoJSON,   } from 'leaflet';
+import { Map, GeoJSON, } from 'leaflet';
 declare var omnivore: any;
 declare var L: any;
 declare var jQuery: any;
-declare function require(name:string);
+declare function require(name: string);
 
 /**
  * Map Model
@@ -44,7 +44,7 @@ export class MapField extends FieldBase<any> {
 
   layerGeoJSON: any = {};
   map: Map;
-  importFailed:boolean = false;
+  importFailed: boolean = false;
   layers = [];
   drawnItems: any = new L.FeatureGroup();
   googleMaps = L.tileLayer('http://{s}.google.com/vt/lyrs=m&x={x}&y={y}&z={z}', {
@@ -150,10 +150,10 @@ export class MapField extends FieldBase<any> {
 
     this.layerGeoJSON = options.value;
     this.mainTabId = options['mainTabId'] || null;
-    this.coordinatesHelp =  this.getTranslated(options.coordinatesHelp, undefined);
+    this.coordinatesHelp = this.getTranslated(options.coordinatesHelp, undefined);
     this.kmlGeoJsonLabel = this.getTranslated(options.kmlGeoJsonLabel, "Enter KML or GeoJSON");
-    this.importButtonLabel =  this.getTranslated(options.importButtonLabel, "Import");
-    this.invalidDataMessage =  this.getTranslated(options.invalidDataMessage, "Entered text is not valid KML or GeoJSON");
+    this.importButtonLabel = this.getTranslated(options.importButtonLabel, "Import");
+    this.invalidDataMessage = this.getTranslated(options.invalidDataMessage, "Entered text is not valid KML or GeoJSON");
   }
 
   onMapReady(map: Map) {
@@ -167,8 +167,15 @@ export class MapField extends FieldBase<any> {
 
 
     if (this.tabId === null) {
-      map.invalidateSize();
-      map.fitBounds(this.drawnItems.getBounds());
+      if (this.visible) {
+        map.invalidateSize();
+        try {
+          // if there are no layers present this will throw an error
+          map.fitBounds(this.drawnItems.getBounds());
+        } catch (e) {
+
+        }
+      }
     } else {
       if (this.editMode) {
         // Note: this assumes the tabId is unqiue in the page, which may not be when there are multiple tab layouts.
@@ -193,18 +200,18 @@ export class MapField extends FieldBase<any> {
   public initMap(map, that) {
     map.invalidateSize();
 
-      try {
-        // if there are no layers present this will throw an error
-        map.fitBounds(this.drawnItems.getBounds());
-      } catch (e) {
+    try {
+      // if there are no layers present this will throw an error
+      map.fitBounds(this.drawnItems.getBounds());
+    } catch (e) {
 
-      }
+    }
 
   }
 
   registerMapEventHandlers(map: Map) {
     let that = this;
-    map.on(L.Draw.Event.CREATED, function(e: any) {
+    map.on(L.Draw.Event.CREATED, function (e: any) {
       var type = e.layerType,
         layer = e.layer;
       that.layers.push(layer);
@@ -213,12 +220,12 @@ export class MapField extends FieldBase<any> {
       return false;
     });
 
-    map.on('draw:edited', function(e: any) {
+    map.on('draw:edited', function (e: any) {
       let layers = e.layers;
       let that2 = that;
-      layers.eachLayer(function(layer) {
-        let layerIndex = _.findIndex(that2.layers, function(o) { return o._leaflet_id == layer._leaflet_id; });
-        if(layerIndex == -1) {
+      layers.eachLayer(function (layer) {
+        let layerIndex = _.findIndex(that2.layers, function (o) { return o._leaflet_id == layer._leaflet_id; });
+        if (layerIndex == -1) {
           that2.layers.push(layer);
         } else {
           that2.layers[layerIndex] = layer;
@@ -227,21 +234,21 @@ export class MapField extends FieldBase<any> {
       });
     });
 
-    map.on('draw:editstop', function(e: any) {
+    map.on('draw:editstop', function (e: any) {
       that.layerGeoJSON = L.featureGroup(that.layers).toGeoJSON();
       that.setValue(that.layerGeoJSON);
     });
 
-    map.on('draw:deletestop', function(e: any) {
+    map.on('draw:deletestop', function (e: any) {
       that.layerGeoJSON = L.featureGroup(that.layers).toGeoJSON();
       that.setValue(that.layerGeoJSON);
     });
 
-    map.on('draw:deleted', function(e: any) {
+    map.on('draw:deleted', function (e: any) {
       let layers = e.layers;
       let that2 = that;
-      layers.eachLayer(function(layer) {
-        _.remove(that2.layers, function(o) { return o._leaflet_id == layer._leaflet_id; });
+      layers.eachLayer(function (layer) {
+        _.remove(that2.layers, function (o) { return o._leaflet_id == layer._leaflet_id; });
       });
     });
   }
@@ -257,7 +264,15 @@ export class MapField extends FieldBase<any> {
       that.layers.push(layer);
     });
   }
-
+  public setVisibility(data, eventConf: any = {}) {
+    let that = this;
+    super.setVisibility(data, eventConf);
+    setTimeout(function () {
+      if (that.visible) {
+        that.initMap(that.map, that);
+      }
+    }, 100)
+  }
 
   postInit(value: any) {
     if (!_.isEmpty(value)) {
@@ -283,6 +298,9 @@ export class MapField extends FieldBase<any> {
       this.formModel.patchValue(this.layerGeoJSON, { emitEvent: emitEvent, emitModelToViewChange: true });
       this.formModel.markAsTouched();
       this.formModel.markAsDirty();
+    } else {
+      this.setEmptyValue();
+      this.drawnItems.clearLayers();
     }
   }
 
@@ -292,7 +310,7 @@ export class MapField extends FieldBase<any> {
   }
 
   reactEvent(eventName: string, eventData: any, origData: any) {
-    super.reactEvent(eventName, eventData,origData);
+    super.reactEvent(eventName, eventData, origData);
     if (!_.isEmpty(this.formModel.value)) {
       this.layerGeoJSON = this.formModel.value;
       this.drawLayers();
@@ -303,43 +321,43 @@ export class MapField extends FieldBase<any> {
   }
 
   importData() {
-    if(this.importDataString.length > 0) {
+    if (this.importDataString.length > 0) {
       try {
-      if(this.importDataString.indexOf("<") == 0) {
-        //probably KML
-        let parsedLayers = omnivore.kml.parse(this.importDataString);
-        if(parsedLayers.getLayers().length == 0) {
-          this.importFailed = true;
-          return false;
+        if (this.importDataString.indexOf("<") == 0) {
+          //probably KML
+          let parsedLayers = omnivore.kml.parse(this.importDataString);
+          if (parsedLayers.getLayers().length == 0) {
+            this.importFailed = true;
+            return false;
+          }
+          let that = this;
+          parsedLayers.eachLayer(layer => {
+            layer.addTo(that.drawnItems);
+            that.layers.push(layer);
+            that.layerGeoJSON = L.featureGroup(that.layers).toGeoJSON();
+            this.drawLayers();
+            that.map.fitBounds(that.drawnItems.getBounds());
+          });
+          this.importDataString = "";
+          this.importFailed = false;
+        } else {
+          let parsedLayers = L.geoJSON(JSON.parse(this.importDataString));
+          let that = this;
+          parsedLayers.eachLayer(layer => {
+            layer.addTo(that.drawnItems);
+            that.layers.push(layer);
+            that.layerGeoJSON = L.featureGroup(that.layers).toGeoJSON();
+            this.drawLayers();
+            that.map.fitBounds(that.drawnItems.getBounds());
+          });
+          this.importDataString = "";
+          this.importFailed = false;
         }
-        let that = this;
-        parsedLayers.eachLayer(layer => {
-          layer.addTo(that.drawnItems);
-          that.layers.push(layer);
-          that.layerGeoJSON = L.featureGroup(that.layers).toGeoJSON();
-          this.drawLayers();
-          that.map.fitBounds(that.drawnItems.getBounds());
-        });
-        this.importDataString = "";
-        this.importFailed = false;
-      } else {
-        let parsedLayers = L.geoJSON(JSON.parse(this.importDataString));
-        let that = this;
-        parsedLayers.eachLayer(layer => {
-          layer.addTo(that.drawnItems);
-          that.layers.push(layer);
-          that.layerGeoJSON = L.featureGroup(that.layers).toGeoJSON();
-          this.drawLayers();
-          that.map.fitBounds(that.drawnItems.getBounds());
-        });
-        this.importDataString = "";
-        this.importFailed = false;
+        this.layerGeoJSON = L.featureGroup(this.layers).toGeoJSON();
+        this.setValue(this.layerGeoJSON);
+      } catch (e) {
+        this.importFailed = true;
       }
-      this.layerGeoJSON = L.featureGroup(this.layers).toGeoJSON();
-      this.setValue(this.layerGeoJSON);
-    } catch (e) {
-      this.importFailed = true;
-    }
 
     }
 
diff --git a/angular-legacy/shared/form/field-map.html b/angular-legacy/shared/form/field-map.html
index 684df5c582..66436e8c36 100644
--- a/angular-legacy/shared/form/field-map.html
+++ b/angular-legacy/shared/form/field-map.html
@@ -1,5 +1,5 @@
-<ng-container *ngIf="field.visible">
-<div class='padding-bottom-10'>
+<ng-container >
+<div class='padding-bottom-10' [style.display]="field.visible? 'block': 'none'">
   <div *ngIf="field.editMode" [formGroup]='form' class="form-group">
   <label [attr.for]="field.name">
     {{field.label}} {{ getRequiredLabelStr()}}
diff --git a/angular-legacy/shared/form/field-relatedobjectdata.component.ts b/angular-legacy/shared/form/field-relatedobjectdata.component.ts
index a3b29127fd..885fd4c2c8 100644
--- a/angular-legacy/shared/form/field-relatedobjectdata.component.ts
+++ b/angular-legacy/shared/form/field-relatedobjectdata.component.ts
@@ -69,6 +69,7 @@ export class RelatedObjectDataField extends FieldBase<any> {
     let getRecordMetaObs = [];
     var that = this;
     const portalPath = this.recordsService.getBrandingAndPortalUrl;
+
     _.forEach(this.value, (item: any) => {
       getRecordMetaObs.push(fromPromise(this.recordsService.getRecordMeta(item.id)).flatMap(meta => {
         const customFields = {oid: item.id, portalPath: portalPath};
@@ -95,6 +96,14 @@ export class RelatedObjectDataField extends FieldBase<any> {
     }
   }
 
+  refreshRelatedObjectData() {
+    this.failedObjects = []
+    this.accessDeniedObjects  = []
+    this.relatedObjects  = []
+    let observables:Observable<any> = this.asyncLoadData();
+    observables.subscribe(result => { });
+  }
+
   createFormModel(valueElem: any = undefined): any {
     if (valueElem) {
       this.value = valueElem;
@@ -110,6 +119,7 @@ export class RelatedObjectDataField extends FieldBase<any> {
   }
 
   setValue(value: any) {
+    this.value = value;
     this.formModel.patchValue(value, { emitEvent: false });
     this.formModel.markAsTouched();
   }
diff --git a/angular-legacy/shared/form/field-repeatable.component.ts b/angular-legacy/shared/form/field-repeatable.component.ts
index 27a021fda4..8027273943 100644
--- a/angular-legacy/shared/form/field-repeatable.component.ts
+++ b/angular-legacy/shared/form/field-repeatable.component.ts
@@ -473,6 +473,86 @@ export class RepeatableContributor extends RepeatableContainer {
     this.fields[0].setMissingFields(val);
     return super.addElem(val);
   }
+
+  public setVisibility(data, eventConf:any = {}) {
+    let newVisible = this.visible;
+    if (_.isArray(this.visibilityCriteria)) {
+      // save the value of this data in a map, so we can run complex conditional logic that depends on one or more fields
+      if (!_.isEmpty(eventConf) && !_.isEmpty(eventConf.srcName)) {
+        this.subscriptionData[eventConf.srcName] = data;
+      }
+      // only run the function set if we have all the data...
+      if (_.size(this.subscriptionData) == _.size(this.visibilityCriteria)) {
+        newVisible = true;
+        _.each(this.visibilityCriteria, (visibilityCriteria) => {
+          const dataEntry = this.subscriptionData[visibilityCriteria.fieldName];
+          newVisible = newVisible && this.execVisibilityFn(dataEntry, visibilityCriteria);
+        });
+
+      }
+    } else
+    if (_.isObject(this.visibilityCriteria) && _.get(this.visibilityCriteria, 'type') == 'function') {
+      newVisible = this.execVisibilityFn(data, this.visibilityCriteria);
+    } else {
+      newVisible = _.isEqual(data, this.visibilityCriteria);
+    }
+    const that = this;
+    setTimeout(() => {
+      if (!newVisible) {
+        if (that.visible) {
+          // remove validators
+          if (that.formModel) {
+            if(that['disableValidators'] != null && typeof(that['disableValidators']) == 'function') {
+              that['disableValidators']();
+            } else {
+              that.formModel.clearValidators();
+            }
+            that.formModel.updateValueAndValidity();
+          }
+          for(let field of that.fields) {
+            if(field.formModel) {
+              if(field['disableValidators'] != null && typeof(field['disableValidators']) == 'function') {
+                field['disableValidators']();
+              } else {
+                field.formModel.clearValidators();
+              }
+              field.formModel.updateValueAndValidity();
+            }
+          }
+        }
+      } else {
+        if (!that.visible) {
+          // restore validators
+          if (that.formModel) {
+            if(that['enableValidators'] != null && typeof(that['enableValidators']) == 'function') {
+              that['enableValidators']();
+            } else {
+              that.formModel.setValidators(that.validators);
+            }
+            that.formModel.updateValueAndValidity();
+          }
+          for(let field of that.fields) {
+            if(field.formModel) {
+              if(field['enableValidators'] != null && typeof(field['enableValidators']) == 'function') {
+                field['enableValidators']();
+              } else {
+                field.formModel.setValidators(field.validators);
+              }
+              setTimeout(() => {
+                field.setValue(field.formModel.value,false,true)
+              });
+              field.formModel.updateValueAndValidity();
+            }
+          }
+        }
+      }
+      that.visible = newVisible;
+    });
+    if(eventConf.returnData == true) {
+      return data;
+    }
+  }
+  
 }
 
 @Component({
diff --git a/angular-legacy/shared/form/field-vocab.component.ts b/angular-legacy/shared/form/field-vocab.component.ts
index 08499cba6f..20036a06c1 100644
--- a/angular-legacy/shared/form/field-vocab.component.ts
+++ b/angular-legacy/shared/form/field-vocab.component.ts
@@ -67,8 +67,10 @@ export class VocabField extends FieldBase<any> {
   public isEmbedded: boolean;
   public groupClass: string;
   public inputClass: string;
+  storedEventData: null;
 
   @Output() onItemSelect: EventEmitter<any> = new EventEmitter<any>();
+  
 
   constructor(options: any, injector: any) {
     super(options, injector);
@@ -215,6 +217,12 @@ export class VocabField extends FieldBase<any> {
 
   public getTitle(data: any): string {
     let title = '';
+    if(!data) {
+      if(this.storedEventData != null) {
+        data = _.clone(this.storedEventData);
+        this.storedEventData == null;
+      }
+    }
     if (data) {
       if (_.isString(data)) {
         return data;
@@ -283,7 +291,11 @@ export class VocabField extends FieldBase<any> {
   public setValue(value: any, emitEvent: boolean = true, updateTitle: boolean = true) {
     this.formModel.setValue(value, { emitEvent: emitEvent });
     if (updateTitle) {
-      this.component.ngCompleter.ctrInput.nativeElement.value = this.getTitle(value);
+      if(!_.isUndefined(this.component.ngCompleter)) {
+        this.component.ngCompleter.ctrInput.nativeElement.value = this.getTitle(value);
+      } else {
+        this.storedEventData = _.clone(value);
+      }
     }
   }
 
@@ -330,6 +342,66 @@ export class VocabField extends FieldBase<any> {
     }
   }
 
+  public setVisibility(data, eventConf:any = {}) {
+    let newVisible = this.visible;
+    if (_.isArray(this.visibilityCriteria)) {
+      // save the value of this data in a map, so we can run complex conditional logic that depends on one or more fields
+      if (!_.isEmpty(eventConf) && !_.isEmpty(eventConf.srcName)) {
+        this.subscriptionData[eventConf.srcName] = data;
+      }
+      // only run the function set if we have all the data...
+      if (_.size(this.subscriptionData) == _.size(this.visibilityCriteria)) {
+        newVisible = true;
+        _.each(this.visibilityCriteria, (visibilityCriteria) => {
+          const dataEntry = this.subscriptionData[visibilityCriteria.fieldName];
+          newVisible = newVisible && this.execVisibilityFn(dataEntry, visibilityCriteria);
+        });
+
+      }
+    } else
+    if (_.isObject(this.visibilityCriteria) && _.get(this.visibilityCriteria, 'type') == 'function') {
+      newVisible = this.execVisibilityFn(data, this.visibilityCriteria);
+    } else {
+      newVisible = _.isEqual(data, this.visibilityCriteria);
+    }
+    const that = this;
+    setTimeout(() => {
+      if (!newVisible) {
+        if (that.visible) {
+          // remove validators
+          if (that.formModel) {
+            if(that['disableValidators'] != null && typeof(that['disableValidators']) == 'function') {
+              that['disableValidators']();
+            } else {
+              that.formModel.clearValidators();
+            }
+            that.formModel.updateValueAndValidity();
+          }
+        }
+      } else {
+        if (!that.visible) {
+          // restore validators
+          if (that.formModel) {       
+              if(that['enableValidators'] != null && typeof(that['enableValidators']) == 'function') {
+                that['enableValidators']();
+              } else {
+                that.formModel.setValidators(that.validators);
+              }
+              that.formModel.updateValueAndValidity();
+              setTimeout(() => {
+              that.component.ngCompleter.ctrInput.nativeElement.value = that.getTitle(null);
+              });
+          }
+        }
+      }
+      that.visible = newVisible;
+    });
+    if(eventConf.returnData == true) {
+      return data;
+    }
+    
+  }
+
 }
 
 export function objectRequired(): ValidationErrors|null {
@@ -343,6 +415,7 @@ export function objectRequired(): ValidationErrors|null {
 
 
 class ExternalLookupDataService extends Subject<CompleterItem[]> implements CompleterData {
+  storedEventData:any = null;
 
   constructor(private url: string,
     private http: Http,
@@ -384,7 +457,14 @@ class ExternalLookupDataService extends Subject<CompleterItem[]> implements Comp
 
   getTitle(data: any): string {
     let title = '';
-    if (data) {
+    if (data == null) {
+      if(this.storedEventData != null) {
+          data = _.clone(this.storedEventData);
+      }
+      this.storedEventData = null;
+    }
+  
+  if(data){
       if (_.isString(this.titleFieldDelim)) {
         _.forEach(this.titleFieldArr, (titleFld: string) => {
           const titleVal = _.get(data, titleFld);
@@ -393,6 +473,7 @@ class ExternalLookupDataService extends Subject<CompleterItem[]> implements Comp
           }
         });
       } else {
+        
         // // expecting a delim pair array, 'prefix', 'suffix'
         // _.forEach(this.titleFieldArr, (titleFld: string, idx) => {
         //   const delimPair = this.titleFieldDelim[idx];
diff --git a/angular-legacy/shared/form/record-meta.component.ts b/angular-legacy/shared/form/record-meta.component.ts
index de3b46895d..33ebb1960d 100644
--- a/angular-legacy/shared/form/record-meta.component.ts
+++ b/angular-legacy/shared/form/record-meta.component.ts
@@ -31,12 +31,14 @@ export class RecordMetadataRetrieverField extends FieldBase<string> {
   }
 
   public publishMetadata(oid: any, config: any) {
-    this.recordsService.getRecordMeta(oid).then(data => {
-      data.oid = oid;
-      this.onValueUpdate.emit(data);
-    });
+    // Only attempt to publish when there is an oid value
+    if (oid != undefined && oid != null && oid != "") {
+      this.recordsService.getRecordMeta(oid).then(data => {
+        data.oid = oid;
+        this.onValueUpdate.emit(data);
+      });
+    }
   }
-
 }
 
 @Component({
diff --git a/angular-legacy/shared/form/timer.component.ts b/angular-legacy/shared/form/timer.component.ts
new file mode 100644
index 0000000000..a327a2bd82
--- /dev/null
+++ b/angular-legacy/shared/form/timer.component.ts
@@ -0,0 +1,78 @@
+import { Component, Output,EventEmitter } from '@angular/core';
+import { FieldBase } from './field-base';
+import { RecordsService } from './records.service';
+import { SimpleComponent } from './field-simple.component';
+import { timer } from 'rxjs/observable/timer';
+import * as _ from "lodash";
+
+export class TimerField extends FieldBase<string> {
+  @Output() public onPollingTick: EventEmitter<any> = new EventEmitter<any>();
+  parameterName: string;
+  timer:any = null;
+  startPollingOnInit: boolean;
+  runOnlyOnce: boolean;
+  initialDelay: number | Date | undefined;
+  pollingPeriod: number | undefined;
+  subscription: any;
+  pollingTickLimit: number;
+  
+  constructor(options: any, injector: any) {
+    super(options, injector);
+    
+    this.parameterName = options.parameterName || '';
+    this.initialDelay = _.get(options, 'initialDelay', 0);
+    this.pollingPeriod = _.get(options, 'pollingPeriod', 10000);
+    this.startPollingOnInit = _.get(options, 'startPollingOnInit', true);
+    this.runOnlyOnce = _.get(options, 'startPollingOnInit', false);
+    this.pollingTickLimit =  _.get(options, 'pollingTickLimit', 1000);
+  }
+
+
+
+  public startPolling(config:any = {}){
+    this.subscription =this.timer.subscribe(pollingTick => {
+      let oid = this.fieldMap._rootComp.oid;
+      let emitData = {
+        emitDate: new Date(),
+        numberOfTicks: pollingTick,
+        oid: oid
+      }
+      this.onPollingTick.emit(
+        emitData
+        );
+      if(this.pollingTickLimit != 0 && pollingTick > this.pollingTickLimit) {
+        this.subscription.unsubscribe();
+      }
+    })
+  }
+
+  public stopPolling(config:any = {}){
+    this.subscription.unsubscribe();
+  }
+
+  initTimer() {
+    if(this.runOnlyOnce) {
+      this.timer = timer(this.initialDelay)
+    } else {
+      this.timer = timer(this.initialDelay,this.pollingPeriod)
+    }
+    
+  }
+
+}
+
+@Component({
+  selector: 'timer',
+  template: `
+  `,
+})
+export class TimerComponent extends SimpleComponent {
+  field: TimerField;
+
+  ngOnInit(){
+    this.field.initTimer();
+    if(this.field.startPollingOnInit) {
+      this.field.startPolling();
+    }
+  }
+}
diff --git a/angular-legacy/shared/shared.module.ts b/angular-legacy/shared/shared.module.ts
index eb9fa8917c..5eeed25456 100644
--- a/angular-legacy/shared/shared.module.ts
+++ b/angular-legacy/shared/shared.module.ts
@@ -45,6 +45,9 @@ import {
 import {
   RecordMetadataRetrieverComponent
 } from './form/record-meta.component';
+import {
+  TimerComponent
+} from './form/timer.component';
 import {
   VocabField,
   VocabFieldComponent,
@@ -178,11 +181,11 @@ import {
 } from './form/field-pagetitle.component'
 @NgModule({
   imports: [BrowserModule, FormsModule, ReactiveFormsModule, NKDatetimeModule, Ng2CompleterModule, TranslateI18NextModule, LeafletModule.forRoot(), LeafletDrawModule.forRoot(), MarkdownModule.forRoot(), TreeModule, MobxAngularModule],
-  exports: [NKDatetimeModule, Ng2CompleterModule, TranslateI18NextModule, DmpFieldComponent, TextFieldComponent, DropdownFieldComponent, TabOrAccordionContainerComponent, ButtonBarContainerComponent, TextBlockComponent, MarkdownTextAreaComponent, TextAreaComponent, DateTimeComponent, AnchorOrButtonComponent, VocabFieldComponent, RepeatableVocabComponent, ContributorComponent, RepeatableContributorComponent, HtmlRawComponent, HiddenValueComponent, WorkflowStepButtonComponent, ActionButtonComponent, LinkValueComponent, SelectionFieldComponent, RepeatableTextfieldComponent, StringTemplatePipe, GenericGroupComponent, RepeatableGroupComponent, MapComponent, ParameterRetrieverComponent, RecordMetadataRetrieverComponent, RelatedObjectSelectorComponent, DataLocationComponent, RelatedFileUploadComponent, PublishDataLocationSelectorComponent, WorkspaceSelectorFieldComponent, TabNavButtonComponent, SpacerComponent, WorkspaceFieldComponent, WorkspaceSelectorComponent, ANDSVocabComponent, PDFListComponent, TreeModule, AsynchComponent, ToggleComponent, TreeNodeCheckboxComponent, PublishDataLocationRefreshComponent, EventHandlerComponent, PageTitleComponent],
-  declarations: [DmpFieldComponent, TextFieldComponent, DropdownFieldComponent, TabOrAccordionContainerComponent, ButtonBarContainerComponent, TextBlockComponent, MarkdownTextAreaComponent, TextAreaComponent, DateTimeComponent, AnchorOrButtonComponent, SaveButtonComponent, CancelButtonComponent, VocabFieldComponent, RepeatableVocabComponent, ContributorComponent, RepeatableContributorComponent, HtmlRawComponent, HiddenValueComponent, WorkflowStepButtonComponent, ActionButtonComponent, LinkValueComponent, SelectionFieldComponent, RepeatableTextfieldComponent, RelatedObjectDataComponent, StringTemplatePipe, GenericGroupComponent, RepeatableGroupComponent, MapComponent, ParameterRetrieverComponent, RecordMetadataRetrieverComponent, RelatedObjectSelectorComponent, DataLocationComponent, RelatedFileUploadComponent, PublishDataLocationSelectorComponent, WorkspaceSelectorFieldComponent, TabNavButtonComponent, SpacerComponent, WorkspaceFieldComponent, WorkspaceSelectorComponent, ANDSVocabComponent, PDFListComponent, AsynchComponent, ToggleComponent, TreeNodeCheckboxComponent, PublishDataLocationRefreshComponent, RecordPermissionsComponent, EventHandlerComponent, PageTitleComponent],
+  exports: [NKDatetimeModule, Ng2CompleterModule, TranslateI18NextModule, DmpFieldComponent, TextFieldComponent, DropdownFieldComponent, TabOrAccordionContainerComponent, ButtonBarContainerComponent, TextBlockComponent, MarkdownTextAreaComponent, TextAreaComponent, DateTimeComponent, AnchorOrButtonComponent, VocabFieldComponent, RepeatableVocabComponent, ContributorComponent, RepeatableContributorComponent, HtmlRawComponent, HiddenValueComponent, WorkflowStepButtonComponent, ActionButtonComponent, LinkValueComponent, SelectionFieldComponent, RepeatableTextfieldComponent, StringTemplatePipe, GenericGroupComponent, RepeatableGroupComponent, MapComponent, ParameterRetrieverComponent, RecordMetadataRetrieverComponent, TimerComponent,  RelatedObjectSelectorComponent, DataLocationComponent, RelatedFileUploadComponent, PublishDataLocationSelectorComponent, WorkspaceSelectorFieldComponent, TabNavButtonComponent, SpacerComponent, WorkspaceFieldComponent, WorkspaceSelectorComponent, ANDSVocabComponent, PDFListComponent, TreeModule, AsynchComponent, ToggleComponent, TreeNodeCheckboxComponent, PublishDataLocationRefreshComponent, EventHandlerComponent, PageTitleComponent],
+  declarations: [DmpFieldComponent, TextFieldComponent, DropdownFieldComponent, TabOrAccordionContainerComponent, ButtonBarContainerComponent, TextBlockComponent, MarkdownTextAreaComponent, TextAreaComponent, DateTimeComponent, AnchorOrButtonComponent, SaveButtonComponent, CancelButtonComponent, VocabFieldComponent, RepeatableVocabComponent, ContributorComponent, RepeatableContributorComponent, HtmlRawComponent, HiddenValueComponent, WorkflowStepButtonComponent, ActionButtonComponent, LinkValueComponent, SelectionFieldComponent, RepeatableTextfieldComponent, RelatedObjectDataComponent, StringTemplatePipe, GenericGroupComponent, RepeatableGroupComponent, MapComponent, ParameterRetrieverComponent, RecordMetadataRetrieverComponent, TimerComponent, RelatedObjectSelectorComponent, DataLocationComponent, RelatedFileUploadComponent, PublishDataLocationSelectorComponent, WorkspaceSelectorFieldComponent, TabNavButtonComponent, SpacerComponent, WorkspaceFieldComponent, WorkspaceSelectorComponent, ANDSVocabComponent, PDFListComponent, AsynchComponent, ToggleComponent, TreeNodeCheckboxComponent, PublishDataLocationRefreshComponent, RecordPermissionsComponent, EventHandlerComponent, PageTitleComponent],
   providers: [FieldControlService, RecordsService, VocabFieldLookupService, ConfigService, TranslationService, UserSimpleService, DashboardService, RolesService, EmailNotificationService, UtilityService, WorkspaceTypeService, FieldControlMetaService, ANDSService],
   bootstrap: [],
-  entryComponents: [DmpFieldComponent, TextFieldComponent, DropdownFieldComponent, TabOrAccordionContainerComponent, ButtonBarContainerComponent, TextBlockComponent, MarkdownTextAreaComponent, TextAreaComponent, DateTimeComponent, AnchorOrButtonComponent, SaveButtonComponent, CancelButtonComponent, VocabFieldComponent, RepeatableVocabComponent, ContributorComponent, RepeatableContributorComponent, HtmlRawComponent, HiddenValueComponent, WorkflowStepButtonComponent, ActionButtonComponent, LinkValueComponent, SelectionFieldComponent, RepeatableTextfieldComponent, RelatedObjectDataComponent, GenericGroupComponent, RepeatableGroupComponent, MapComponent, ParameterRetrieverComponent, RecordMetadataRetrieverComponent, RelatedObjectSelectorComponent, DataLocationComponent, RelatedFileUploadComponent, PublishDataLocationSelectorComponent, WorkspaceSelectorFieldComponent, TabNavButtonComponent, SpacerComponent, WorkspaceFieldComponent, WorkspaceSelectorComponent, ANDSVocabComponent, PDFListComponent, AsynchComponent, ToggleComponent, TreeNodeCheckboxComponent, PublishDataLocationRefreshComponent, RecordPermissionsComponent, EventHandlerComponent, PageTitleComponent]
+  entryComponents: [DmpFieldComponent, TextFieldComponent, DropdownFieldComponent, TabOrAccordionContainerComponent, ButtonBarContainerComponent, TextBlockComponent, MarkdownTextAreaComponent, TextAreaComponent, DateTimeComponent, AnchorOrButtonComponent, SaveButtonComponent, CancelButtonComponent, VocabFieldComponent, RepeatableVocabComponent, ContributorComponent, RepeatableContributorComponent, HtmlRawComponent, HiddenValueComponent, WorkflowStepButtonComponent, ActionButtonComponent, LinkValueComponent, SelectionFieldComponent, RepeatableTextfieldComponent, RelatedObjectDataComponent, GenericGroupComponent, RepeatableGroupComponent, MapComponent, ParameterRetrieverComponent, RecordMetadataRetrieverComponent, TimerComponent, RelatedObjectSelectorComponent, DataLocationComponent, RelatedFileUploadComponent, PublishDataLocationSelectorComponent, WorkspaceSelectorFieldComponent, TabNavButtonComponent, SpacerComponent, WorkspaceFieldComponent, WorkspaceSelectorComponent, ANDSVocabComponent, PDFListComponent, AsynchComponent, ToggleComponent, TreeNodeCheckboxComponent, PublishDataLocationRefreshComponent, RecordPermissionsComponent, EventHandlerComponent, PageTitleComponent]
 
 })
 export class SharedModule {}
diff --git a/angular/shared/form/custom-validation-handler.ts b/angular/shared/form/custom-validation-handler.ts
deleted file mode 100644
index d841e41f4b..0000000000
--- a/angular/shared/form/custom-validation-handler.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface CustomValidationHandlerField {
-
-    enableValidators();
-
-    disableValidators();
-}
\ No newline at end of file
diff --git a/views/default/default/apidocsapib.ejs b/views/default/default/apidocsapib.ejs
index 17c3e0d23c..e5e720e9c1 100644
--- a/views/default/default/apidocsapib.ejs
+++ b/views/default/default/apidocsapib.ejs
@@ -528,11 +528,11 @@ The ReDBox Portal API provides authorized access to manage functions.
 
 ## User Management Actions [/<%= branding %>/<%= portal %>/api/users]
 
-### List users in the system [GET /<%= branding %>/<%= portal %>/api/users{?searchBy,query,start,rows}]
+### List users in the system [GET /<%= branding %>/<%= portal %>/api/users{?searchBy,query,page,pageSize}]
 + Parameters
-    + start: `0` (number, optional) - The index number for the first value to return from the result set.
-        + Default: 0
-    + rows: `10` (number,optional) - The number of records to return in the request
+    + page: `1` (number, optional) - The page index of the result set to show.
+        + Default: 1
+    + pageSize: `10` (number,optional) - The number of records to return in a page
         + Default: 10
     + searchBy: `type` (string, optional) - The attribute to search by. e.g. email
     + query: `local` (string, optional) - The value to query. Only exact matches.