       state.set(null)
     else
       state.set(clickedInput)
+
+_removeSuggestedProperties = (instance, props) ->
+  suggestedFields = instance.suggestedFields
+  suggestedFields.set(_.difference(suggestedFields.get(), props))
 
 Template.incidentForm.onCreated ->
   @incidentStatus = new ReactiveVar('')

      firstItem.remove()

  'mouseup .select2-selection': (event, instance) ->
    suggestedFields = instance.suggestedFields
    suggestedFields.set(_.without(suggestedFields.get(), 'locations'))

  'mouseup .incident--dates': (event, instance) ->
    suggestedFields = instance.suggestedFields
    suggestedFields.set(_.without(suggestedFields.get(), 'dateRange'))

  'click .cumulative, keyup .cumulative': (event, instance) ->
    suggestedFields = instance.suggestedFields
    suggestedFields.set(_.without(suggestedFields.get(), 'cumulative'))

  'submit form': (event, instance) ->
    prevented = event.isDefaultPrevented()
    instance.data.valid.set(not prevented)
    if prevented


  @$('#add-incident').validator()
  #Update the validator when Blaze adds incident type related inputs
  @autorun =>
    @incidentType.get()
    Meteor.defer =>
      @$('#add-incident').validator('update')

  if not @incidentData.locations.length
    _removeSuggestedProperties(@, ['locations'])
    @$('#add-incident').validator('validate')

Template.incidentForm.helpers
  incidentData: ->
