             deferred.promise()
         clearSelectedUnit: ->
             @_setSelectedUnits()
-            @clearUnits
-                all: true
+            @clearUnits all: true
+            @_resolveImmediately()
 
         selectEvent: (event) ->
             unit = event.getUnit()

            @_resetSearchResults()

        isStateEmpty: () ->
            @units.isEmpty() and
            @selectedPosition.isEmpty() and
            @services.isEmpty() and
            @selectedEvents.isEmpty()

                selectPosition: =>
                    slug = @appModels.selectedPosition.value().slugifyAddress()
                    "address/#{slug}"
                clearSelectedPosition: blank
                clearSelectedUnit: blank
                clearSearchResults: blank
                closeSearch: blank
                home: blank

            super options
            @route /^unit\/(.*?)$/, @renderUnit
            @route /^search\/(\?.*)/, @renderSearch
