diff --git a/client/components/swimlanes/swimlaneHeader.js b/client/components/swimlanes/swimlaneHeader.js
index 610eea685..61bf4bb95 100644
--- a/client/components/swimlanes/swimlaneHeader.js
+++ b/client/components/swimlanes/swimlaneHeader.js
@@ -47,25 +47,21 @@ Template.swimlaneFixedHeader.helpers({
   },
 });
 
-BlazeComponent.extendComponent({
+Template.swimlaneActionPopup.events({
+  'click .js-set-swimlane-color': Popup.open('setSwimlaneColor'),
+  'click .js-close-swimlane'(event) {
+    event.preventDefault();
+    this.archive();
+    Popup.close();
+  },
+  'click .js-move-swimlane': Popup.open('moveSwimlane'),
+});
+
+Template.swimlaneActionPopup.events({
   isCommentOnly() {
     return Meteor.user().isCommentOnly();
   },
-
-  events() {
-    return [
-      {
-        'click .js-set-swimlane-color': Popup.open('setSwimlaneColor'),
-        'click .js-close-swimlane'(event) {
-          event.preventDefault();
-          this.archive();
-          Popup.close();
-        },
-        'click .js-move-swimlane': Popup.open('moveSwimlane'),
-      },
-    ];
-  },
-}).register('swimlaneActionPopup');
+});
 
 BlazeComponent.extendComponent({
   onCreated() {
diff --git a/config/router.js b/config/router.js
index 0704adb63..de5654925 100644
--- a/config/router.js
+++ b/config/router.js
@@ -14,7 +14,7 @@ FlowRouter.route('/', {
     Session.set('currentCard', null);
 
     Filter.reset();
-    Session.set('sortBy', '')
+    Session.set('sortBy', '');
     EscapeActions.executeAll();
 
     Utils.manageCustomUI();
@@ -36,7 +36,7 @@ FlowRouter.route('/public', {
     Session.set('currentCard', null);
 
     Filter.reset();
-    Session.set('sortBy', '')
+    Session.set('sortBy', '');
     EscapeActions.executeAll();
 
     Utils.manageCustomUI();
@@ -61,7 +61,7 @@ FlowRouter.route('/b/:id/:slug', {
     // want to excape every current actions (filters, etc.)
     if (previousBoard !== currentBoard) {
       Filter.reset();
-      Session.set('sortBy', '')
+      Session.set('sortBy', '');
       EscapeActions.executeAll();
     } else {
       EscapeActions.executeUpTo('popup-close');
@@ -121,7 +121,7 @@ FlowRouter.route('/my-cards', {
   triggersEnter: [AccountsTemplates.ensureSignedIn],
   action() {
     Filter.reset();
-    Session.set('sortBy', '')
+    Session.set('sortBy', '');
     // EscapeActions.executeAll();
     EscapeActions.executeUpTo('popup-close');
 
@@ -141,7 +141,7 @@ FlowRouter.route('/due-cards', {
   triggersEnter: [AccountsTemplates.ensureSignedIn],
   action() {
     Filter.reset();
-    Session.set('sortBy', '')
+    Session.set('sortBy', '');
     // EscapeActions.executeAll();
     EscapeActions.executeUpTo('popup-close');
 
@@ -161,7 +161,7 @@ FlowRouter.route('/global-search', {
   triggersEnter: [AccountsTemplates.ensureSignedIn],
   action() {
     Filter.reset();
-    Session.set('sortBy', '')
+    Session.set('sortBy', '');
     // EscapeActions.executeAll();
     EscapeActions.executeUpTo('popup-close');
 
@@ -188,7 +188,7 @@ FlowRouter.route('/broken-cards', {
     const brokenCardsTemplate = 'brokenCards';
 
     Filter.reset();
-    Session.set('sortBy', '')
+    Session.set('sortBy', '');
     // EscapeActions.executeAll();
     EscapeActions.executeUpTo('popup-close');
 
@@ -215,7 +215,7 @@ FlowRouter.route('/import/:source', {
     Session.set('importSource', params.source);
 
     Filter.reset();
-    Session.set('sortBy', '')
+    Session.set('sortBy', '');
     EscapeActions.executeAll();
     BlazeLayout.render('defaultLayout', {
       headerBar: 'importHeaderBar',
@@ -234,7 +234,7 @@ FlowRouter.route('/setting', {
       Session.set('currentCard', null);
 
       Filter.reset();
-      Session.set('sortBy', '')
+      Session.set('sortBy', '');
       EscapeActions.executeAll();
     },
   ],
@@ -257,7 +257,7 @@ FlowRouter.route('/information', {
       Session.set('currentCard', null);
 
       Filter.reset();
-      Session.set('sortBy', '')
+      Session.set('sortBy', '');
       EscapeActions.executeAll();
     },
   ],
@@ -279,7 +279,7 @@ FlowRouter.route('/people', {
       Session.set('currentCard', null);
 
       Filter.reset();
-      Session.set('sortBy', '')
+      Session.set('sortBy', '');
       EscapeActions.executeAll();
     },
   ],