diff --git a/addon/controllers/action-list.coffee b/addon/controllers/action-list.coffee
index 07d4f67..b3ddea1 100644
--- a/addon/controllers/action-list.coffee
+++ b/addon/controllers/action-list.coffee
@@ -21,9 +21,7 @@ export default Ember.Controller.extend
     "#{base_url}/export_technical.csv?#{filter_addition}"
   apply_filters: ->
     @incrementProperty 'filters.filter_calls'
-    @set 'model.project_instance_actions.page', 1
-    @set 'model.project_instance_actions.lastPage', null
-    @get('model.project_instance_actions').setOtherParam('q', @get('filter_query'))
+    @get('model.project_instance_actions')?.reload()
     false
   actions:
     refresh_list: -> @apply_filters()
diff --git a/addon/controllers/action-list.js b/addon/controllers/action-list.js
index 27b7337..d527dae 100644
--- a/addon/controllers/action-list.js
+++ b/addon/controllers/action-list.js
@@ -34,10 +34,11 @@ export default Ember.Controller.extend({
     return base_url + "/export_technical.csv?" + filter_addition;
   }),
   apply_filters: function() {
+    var ref;
     this.incrementProperty('filters.filter_calls');
-    this.set('model.project_instance_actions.page', 1);
-    this.set('model.project_instance_actions.lastPage', null);
-    this.get('model.project_instance_actions').setOtherParam('q', this.get('filter_query'));
+    if ((ref = this.get('model.project_instance_actions')) != null) {
+      ref.reload();
+    }
     return false;
   },
   actions: {
diff --git a/addon/routes/action-list.coffee b/addon/routes/action-list.coffee
index cc9aaa7..841eb3b 100644
--- a/addon/routes/action-list.coffee
+++ b/addon/routes/action-list.coffee
@@ -1,5 +1,5 @@
 import Ember from 'ember'
-import PagedRemoteArray from 'ember-cli-pagination/remote/paged-remote-array'
+import PagedRemoteArray from 'ember-cli-dunlop/utils/paged-remote-array'
 export default_filter = Ember.Object.create
   filter_calls: 0
   workflow_action_definition_id_in: []
@@ -15,54 +15,46 @@ export default_filter = Ember.Object.create
   s: 'target_date asc'
 
 export default Ember.Route.extend
-  queryParams:
-    q:
-      refreshModel: true
+  queryParams: {q: refreshModel: true}
+  modelName: 'panda/project-instance-action'
   setupController: (controller) ->
     controller.set 'filters', default_filter
     @_super arguments...
 
   model: (params) ->
     #@store.findAll('epots/migration-window-planning')
-    otherParams = {q: default_filter.toProperties()}
-    includes = [
-      'workflow_action_definition.~workflow_action_connections'
-      'workflow_action_definition.~pointing_workflow_action_connections'
-      'workflow_action_definition.~organization'
-      'workflow_action_definition.~workflow_action_offsets'
-      'project_instance_group.~project'
-      'project_instance_group.~project_instance'
-      'project_instance_group.~project_instance_actions'
-      'project_instance_group.workflow_group'
-      'project_instance.~project'
-      'project_instance.project_scenario.~project'
-      'project_instance.project_scenario.~workflow_groups'
-      'project_instance.project_scenario.~workflow_action_definitions'
-      'pointing_project_instance_action_connections.project_instance_action.~project'
-      'pointing_project_instance_action_connections.project_instance_action.~project_instance'
-      'pointing_project_instance_action_connections.project_instance_action.~project_instance_group'
-      'pointing_project_instance_action_connections.project_instance_action.~pointing_project_instance_action_connections'
-      'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_connections'
-      'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~pointing_workflow_action_connections'
-      'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~organization'
-      'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_offsets'
-    ].join(',')
-    #includes += ','
-    #includes += [
-    #  'project.users'
-    #].join(',')
-    includes = 'action-list'
-    otherParams.include = includes
+    #includes = [
+    #  'workflow_action_definition.~workflow_action_connections'
+    #  'workflow_action_definition.~pointing_workflow_action_connections'
+    #  'workflow_action_definition.~organization'
+    #  'workflow_action_definition.~workflow_action_offsets'
+    #  'project_instance_group.~project'
+    #  'project_instance_group.~project_instance'
+    #  'project_instance_group.~project_instance_actions'
+    #  'project_instance_group.workflow_group'
+    #  'project_instance.~project'
+    #  'project_instance.project_scenario.~project'
+    #  'project_instance.project_scenario.~workflow_groups'
+    #  'project_instance.project_scenario.~workflow_action_definitions'
+    #  'pointing_project_instance_action_connections.project_instance_action.~project'
+    #  'pointing_project_instance_action_connections.project_instance_action.~project_instance'
+    #  'pointing_project_instance_action_connections.project_instance_action.~project_instance_group'
+    #  'pointing_project_instance_action_connections.project_instance_action.~pointing_project_instance_action_connections'
+    #  'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_connections'
+    #  'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~pointing_workflow_action_connections'
+    #  'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~organization'
+    #  'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_offsets'
+    #]
     Ember.RSVP.hash
       projects: @store.findAll('panda/project')
       organizations: @store.findAll('panda/organization')
       project_instance_actions:
         PagedRemoteArray.create
-          modelName:   'panda/project-instance-action'
+          modelName:   @modelName
           store:       @store
+          filters:     default_filter
           page:        params.page || 1
           perPage:     params.perPage || 30
-          otherParams: otherParams
-          paramMapping:
-            total_pages: 'total-pages'
-            total_count: 'total-count'
+          otherParams:
+            #include: includes.join(',')
+            include: 'action-list'
diff --git a/addon/routes/action-list.js b/addon/routes/action-list.js
index 6164727..6667798 100644
--- a/addon/routes/action-list.js
+++ b/addon/routes/action-list.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript 1.12.5
 import Ember from 'ember';
 
-import PagedRemoteArray from 'ember-cli-pagination/remote/paged-remote-array';
+import PagedRemoteArray from 'ember-cli-dunlop/utils/paged-remote-array';
 
 export var default_filter = Ember.Object.create({
   filter_calls: 0,
@@ -23,30 +23,23 @@ export default Ember.Route.extend({
       refreshModel: true
     }
   },
+  modelName: 'panda/project-instance-action',
   setupController: function(controller) {
     controller.set('filters', default_filter);
     return this._super.apply(this, arguments);
   },
   model: function(params) {
-    var includes, otherParams;
-    otherParams = {
-      q: default_filter.toProperties()
-    };
-    includes = ['workflow_action_definition.~workflow_action_connections', 'workflow_action_definition.~pointing_workflow_action_connections', 'workflow_action_definition.~organization', 'workflow_action_definition.~workflow_action_offsets', 'project_instance_group.~project', 'project_instance_group.~project_instance', 'project_instance_group.~project_instance_actions', 'project_instance_group.workflow_group', 'project_instance.~project', 'project_instance.project_scenario.~project', 'project_instance.project_scenario.~workflow_groups', 'project_instance.project_scenario.~workflow_action_definitions', 'pointing_project_instance_action_connections.project_instance_action.~project', 'pointing_project_instance_action_connections.project_instance_action.~project_instance', 'pointing_project_instance_action_connections.project_instance_action.~project_instance_group', 'pointing_project_instance_action_connections.project_instance_action.~pointing_project_instance_action_connections', 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_connections', 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~pointing_workflow_action_connections', 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~organization', 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_offsets'].join(',');
-    includes = 'action-list';
-    otherParams.include = includes;
     return Ember.RSVP.hash({
       projects: this.store.findAll('panda/project'),
       organizations: this.store.findAll('panda/organization'),
       project_instance_actions: PagedRemoteArray.create({
-        modelName: 'panda/project-instance-action',
+        modelName: this.modelName,
         store: this.store,
+        filters: default_filter,
         page: params.page || 1,
         perPage: params.perPage || 30,
-        otherParams: otherParams,
-        paramMapping: {
-          total_pages: 'total-pages',
-          total_count: 'total-count'
+        otherParams: {
+          include: 'action-list'
         }
       })
     });
diff --git a/app/templates/action-list.emblem b/app/templates/action-list.emblem
index cc6b0fc..d5468b0 100644
--- a/app/templates/action-list.emblem
+++ b/app/templates/action-list.emblem
@@ -1,5 +1,6 @@
 = page-title 'action_list.title'
   = pagination-progress content=model.project_instance_actions class='between-brackets'
+  i.pointable.refresh.icon{action 'reload' model.project_instance_actions}
   .ui.top-right.pagination.menu= page-numbers content=model.project_instance_actions showFL=true
 .ui.attached.segment
   = ui-dropdown class='violet button pull-right'
@@ -12,9 +13,6 @@
         a href=export_technical_url: span Technical
   = action-list/project-filter apply_filters=(action 'refresh_list') filters=filters scope_project=scope_project scope_scenario=scope_scenario projects=model.projects
   = action-list/organization-filter apply_filters=(action 'refresh_list') filters=filters scope_organization=scope_organization organizations=model.organizations
-  '
-  .ui.small.icon.button{action 'refresh_list'}
-    i.refresh.icon
 table.ui.attached.stiped.table
   thead
     tr