 
     PAGE_SIZE = appSettings.page_size
 
-    UNIT_MINIMAL_ONLY_FIELDS = [
+    _unit_minimal_only_fields = [
         'root_service_nodes',
         'services',
         'location',
         'name',
         'street_address',
         'contract_type',
-    ].join(',')
+    ]
+
+    UNIT_MINIMAL_ONLY_FIELDS = _unit_minimal_only_fields.join(',')
+    UNIT_SEARCH_MINIMAL_ONLY_FIELDS = (_(_unit_minimal_only_fields).map (f) -> "unit.#{f}").join(',')
 
     class BaseControl extends Marionette.Controller
         initialize: (appModels) ->

                            r.get('object_type') == 'unit'
                        @units.setFilter 'search', true
                    cancelToken: cancelToken

                if filters? and _.size(filters) > 0
                    opts.data = filters

                opts = @searchResults.search(query, opts).done =>
                    return if canceled

                unless @searchResults.isEmpty()
                    @searchResults.reset []

                @searchResults.pageSize = 1000
                opts =
                    onPageComplete: =>
                        if _paq?
