                     return
                 bboxString = _.first bboxStrings
                 unitList = new models.UnitList null, forcedPriority: false
-                opts = success: (coll, resp, options) =>
-                    if unitList.length
-                        @units.add unitList.toArray()
-                    unless unitList.fetchNext(opts)
-                        unitList.trigger 'finished',
+                opts =
+                    data:
+                        only: 'name,location,root_services'
+                    success: (coll, resp, options) =>
+                        if unitList.length
+                            @units.add unitList.toArray()
+                        unless unitList.fetchNext(opts)
+                            unitList.trigger 'finished',
                             keepViewport: true
                 unitList.pageSize = PAGE_SIZE
                 unitList.setFilter 'bbox', bboxString
                 layer = p13n.get 'map_background_layer'
                 unitList.setFilter 'bbox_srid', if layer in ['servicemap', 'accessible_map'] then 3067 else 3879
-                unitList.setFilter 'only', 'name,location,root_services'
                 if level?
                     unitList.setFilter 'level', level
 

            opts =
                # todo: re-enable
                #spinnerTarget: spinnerTarget
                success: =>
                    @units.add unitList.toArray(), merge: true
                    service.get('units').add unitList.toArray()

                        @units.setFilter 'level', context.query.level
                    @units
                        .setFilter 'division', ocdIds.join(',')
                    opts =
                        data:
                            only: ['root_services', 'location', 'name'].join(',')
                        success: =>
                            unless @units.fetchNext opts
                                @units.trigger 'finished'
                                deferred.resolve()
                    @units.fetch opts
                    @units

