diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4cb29e8..eb2068b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,10 +15,11 @@ name: tests
 jobs:
   setup:
     name: setup
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Slack Notification on Start
         uses: rtCamp/action-slack-notify@v2.2.0
+        if: env.SLACK_WEBHOOK != ''
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }}
           SLACK_CHANNEL: notify-nc3-tests
@@ -28,7 +29,7 @@ jobs:
   tests:
     name: tests
     needs: setup
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         php: [ '7.1', '7.2', '7.3', '7.4' ]
@@ -44,12 +45,13 @@ jobs:
         MYSQL_VERSION: ${{ matrix.mysql }}
         MYSQL_ROOT_PASSWORD: root
         MYSQL_DATABASE: cakephp_test
+        COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Fix up git URLs
-        run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig
+        run: echo -e '[url "https://github.com/"]\n  insteadOf = "git://github.com/"' >> ~/.gitconfig
 
       - name: environment
         run: |
@@ -91,46 +93,53 @@ jobs:
           docker-compose exec -T nc3app bash /opt/scripts/app-build.sh
 
       - name: phpcs (PHP CodeSniffer)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh
 
       - name: phpmd (PHP Mess Detector)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh
 
       - name: phpcpd (PHP Copy/Paste Detector)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh
 
       - name: gjslint (JavaScript Style Check)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh
 
       - name: phpdoc (PHP Documentor)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh
 
       - name: phpunit (PHP UnitTest)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh
           sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build
 
-      - name: push coveralls
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COVERALLS_FLAG_NAME: ${{ matrix.php }}
-        run: |
-          cd ${NC3_BUILD_DIR}
-          ls -la ${NC3_BUILD_DIR}
-          vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
+#       - name: push coveralls
+#         env:
+#           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#           COVERALLS_FLAG_NAME: ${{ matrix.php }}
+#         run: |
+#           cd ${NC3_BUILD_DIR}
+#           ls -la ${NC3_BUILD_DIR}
+#           vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
 
       - name: docker-compose remove
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose rm -f
@@ -138,7 +147,7 @@ jobs:
       # テスト失敗時はこちらのステップが実行される
       - name: Slack Notification on Failure
         uses: rtCamp/action-slack-notify@v2.2.0
-        if: failure()
+        if: env.SLACK_WEBHOOK != '' && failure()
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }}
           SLACK_CHANNEL: notify-nc3-tests
@@ -147,13 +156,13 @@ jobs:
 
   teardown:
     name: teardown
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: tests
     steps:
       # テスト成功時はこちらのステップが実行される
       - name: Slack Notification on Success
-        if: success()
         uses: rtCamp/action-slack-notify@v2.2.0
+        if: env.SLACK_WEBHOOK != '' && success()
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }}
           SLACK_CHANNEL: notify-nc3-tests
diff --git a/Controller/CalendarsAppController.php b/Controller/CalendarsAppController.php
index 5fcd1c3..be7f08f 100644
--- a/Controller/CalendarsAppController.php
+++ b/Controller/CalendarsAppController.php
@@ -234,15 +234,22 @@ protected function _setCalendarCommonVars($vars) {
 				//$order = array('TrackableCreator' . '.username');
 				//$order = array('TrackableCreator' . '.handlename');
 				$order = array(
-						'TrackableCreator' . '.handlename',
-						'CalendarEvent' . '.dtstart',
-						);
+					'TrackableCreator' . '.handlename',
+					'CalendarEvent' . '.dtstart',
+					'CalendarEvent' . '.id',
+				);
 			} else { //時間順
-				$order = array('CalendarEvent' . '.dtstart');
+				$order = array(
+					'CalendarEvent' . '.dtstart',
+					'CalendarEvent' . '.id',
+				);
 			}
 		} else {
 			//$order = array('CalendarEvent' . '.start_date');
-			$order = array('CalendarEvent' . '.dtstart');
+			$order = array(
+				'CalendarEvent' . '.dtstart',
+				'CalendarEvent' . '.id',
+			);
 		}
 
 		//room_idとspace_idの対応表を載せておく。
diff --git a/VERSION.txt b/VERSION.txt
index fa7adc7..86fb650 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-3.3.5
+3.3.7
diff --git a/View/CalendarMailSettings/edit.ctp b/View/CalendarMailSettings/edit.ctp
index 3e84770..f3cdde4 100644
--- a/View/CalendarMailSettings/edit.ctp
+++ b/View/CalendarMailSettings/edit.ctp
@@ -35,7 +35,7 @@ $urlParams = array(
 					<?php foreach ($mailRooms as $key => $name) : ?>
 					<li<?php echo ($key == Current::read('Room.id') ? ' class="active"' : ''); ?>>
 						<?php echo $this->NetCommonsHtml->link($name,
-							$urlParams + ['?' => ['room' => $key]]
+							array_merge_recursive($urlParams, ['?' => ['room' => $key]])
 						); ?>
 					</li>
 					<?php endforeach; ?>