                 initial: true
             @searchState.trigger 'change', @searchState,
                 initial: true
+
             if @searchResults.query == query
                 @searchResults.trigger 'ready'
                 return
+
+            if 'search' in _(@units.filters).keys()
+                @units.reset []
+
             unless @searchResults.isEmpty()
                 @searchResults.reset []
             @searchResults.search query,

            else if not @units.isEmpty()
                @units.reset()

        setUnits: (units) ->
            @services.set []
            @_setSelectedUnits()
            @units.reset units.toArray()
            # Current cluster based map logic
            # requires batch reset signal.
        setUnit: (unit) ->

                    @setUnits new models.SearchList(
                        @searchResults.filter (r) ->
                            r.get('object_type') == 'unit'
                    ), 'search'
                    @searchResults.trigger 'ready'
                    @services.set []
        search: (query) ->
