diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts
index 2987e78d8e..44addfb6c1 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts
@@ -32,8 +32,8 @@ describe('ActivitiFilters', () => {
     let filterList: ActivitiFilters;
 
     let fakeGlobalFilter = [];
-    fakeGlobalFilter.push(new FilterModel('FakeInvolvedTasks', false, 'glyphicon-align-left', '', 'open',  'fake-involved'));
-    fakeGlobalFilter.push(new FilterModel('FakeMyTasks', false, 'glyphicon-align-left', '', 'open',  'fake-assignee'));
+    fakeGlobalFilter.push(new FilterModel('FakeInvolvedTasks', false, 'glyphicon-align-left', '', 'open', 'fake-involved'));
+    fakeGlobalFilter.push(new FilterModel('FakeMyTasks', false, 'glyphicon-align-left', '', 'open', 'fake-assignee'));
 
     let fakeGlobalFilterPromise = new Promise(function (resolve, reject) {
         resolve(fakeGlobalFilter);
@@ -55,7 +55,7 @@ describe('ActivitiFilters', () => {
     it('should return the filter task list', (done) => {
         spyOn(filterList.activiti, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
 
-        filterList.onSuccess.subscribe( (res) => {
+        filterList.onSuccess.subscribe((res) => {
             expect(res).toBeDefined();
             expect(filterList.filters).toBeDefined();
             expect(filterList.filters.length).toEqual(2);
@@ -67,10 +67,31 @@ describe('ActivitiFilters', () => {
         filterList.ngOnInit();
     });
 
+    it('should return the filter task list, filtered By Name', (done) => {
+
+        let fakeDeployedApplicationsPromise = new Promise(function (resolve, reject) {
+            resolve({});
+        });
+
+        spyOn(filterList.activiti, 'getDeployedApplications').and.returnValue(Observable.fromPromise(fakeDeployedApplicationsPromise));
+        spyOn(filterList.activiti, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeGlobalFilterPromise));
+
+        filterList.appName = 'test';
+
+        filterList.onSuccess.subscribe((res) => {
+            let deployApp: any = filterList.activiti.getDeployedApplications;
+            expect(deployApp.calls.count()).toEqual(1);
+            expect(res).toBeDefined();
+            done();
+        });
+
+        filterList.ngOnInit();
+    });
+
     it('should emit an error with a bad response', (done) => {
         spyOn(filterList.activiti, 'getTaskListFilters').and.returnValue(Observable.fromPromise(fakeErrorFilterPromise));
 
-        filterList.onError.subscribe( (err) => {
+        filterList.onError.subscribe((err) => {
             expect(err).toBeDefined();
             done();
         });
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
index 2f91fae68b..cc63fed507 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
@@ -89,12 +89,12 @@ export class ActivitiFilters implements OnInit {
         if (this.appName) {
             this.filterByAppName();
         } else {
-            this.filterByAppId();
+            this.filterByAppId(this.appId);
         }
     }
 
-    private filterByAppId() {
-        this.activiti.getTaskListFilters(this.appId).subscribe(
+    private filterByAppId(appId) {
+        this.activiti.getTaskListFilters(appId).subscribe(
             (res: FilterModel[]) => {
                 res.forEach((filter) => {
                     this.filterObserver.next(filter);
@@ -111,18 +111,7 @@ export class ActivitiFilters implements OnInit {
     private filterByAppName() {
         this.activiti.getDeployedApplications(this.appName).subscribe(
             application => {
-                this.activiti.getTaskListFilters(application.id).subscribe(
-                    (res: FilterModel[]) => {
-                        res.forEach((filter) => {
-                            this.filterObserver.next(filter);
-                        });
-                        this.onSuccess.emit(res);
-                    },
-                    (err) => {
-                        console.log(err);
-                        this.onError.emit(err);
-                    }
-                );
+                this.filterByAppId(application.id);
             },
             (err) => {
                 console.log(err);