diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
index 0840d2f48fd0169579913a6454122efad913b957..6ec2e9e35cb6fdd9ccfca8fc43a3398ddf13acff 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
@@ -33,7 +33,7 @@ $scope.columns = [
         enableCellEdit: false,
         enableCellEditOnFocus: false,
         cellTemplate:'<div style=\'text-align:left\'>{{row.entity[col.field] | date:\'yyyy-MM-dd HH:mm:ss\'}}</div>',
-        sort: { direction: uiGridConstants.ASC }
+        sort: { direction: uiGridConstants.ASC, priority: 2 }
     },
     { field: 'endtime',
         displayName: 'End',
@@ -74,7 +74,8 @@ $scope.columns = [
             condition: uiGridConstants.filter.EXACT,
             type: uiGridConstants.filter.SELECT,
             selectOptions: []
-        }
+        },
+        sort: { direction: uiGridConstants.ASC, priority: 1 }
     },
     { field: 'mom_object_group_id',
         displayName: 'Group',
@@ -571,7 +572,7 @@ gridControllerMod.directive('contextMenu', ['$document', '$window', function($do
                 });
             }
 
-            var active_selected_cep4_pipelines = selected_cep4_tasks.filter(function(t) { return t.status == 'active' && t.type == 'pipeline'; });
+            var active_selected_cep4_pipelines = selected_cep4_tasks.filter(function(t) { return (t.status == 'active' || t.status == 'completing') && t.type == 'pipeline'; });
 
             if(active_selected_cep4_pipelines.length > 0) {
                 var liContent = '<li><a href="#">Abort active CEP4 pipelines</a></li>'
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/gantt-plugins/angular-gantt-contextmenu-plugin.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/gantt-plugins/angular-gantt-contextmenu-plugin.js
index a7b4b841d95d179a35b6db3652e4d4c56733185f..1e05df07db08861df57260dc4659d80531c329b6 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/gantt-plugins/angular-gantt-contextmenu-plugin.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/gantt-plugins/angular-gantt-contextmenu-plugin.js
@@ -147,7 +147,7 @@
                                 });
                             }
 
-                            var active_selected_cep4_pipelines = selected_cep4_tasks.filter(function(t) { return t.status == 'active' && t.type == 'pipeline'; });
+                            var active_selected_cep4_pipelines = selected_cep4_tasks.filter(function(t) { return (t.status == 'active' || t.status == 'completing') && t.type == 'pipeline'; });
 
                             if(active_selected_cep4_pipelines.length > 0) {
                                 var liContent = '<li><a href="#">Abort active CEP4 pipelines</a></li>'