diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6da4321..f46fc05 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -30,8 +30,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '7.1', '7.2', '7.3', '7.4' ]
-        mysql: [ '5.7', '8.0' ]
+        php: [ '7.4' ]
+        mysql: [ '8.0' ]
 
     env:
         NC3_BUILD_DIR: "/opt/nc3"
diff --git a/Config/Migration/1769652195_add_index.php b/Config/Migration/1769652195_add_index.php
index c325b88..96398c9 100644
--- a/Config/Migration/1769652195_add_index.php
+++ b/Config/Migration/1769652195_add_index.php
@@ -1,8 +1,12 @@
 <?php
+/**
+ * AddIndex
+ */
+
 /**
  * インデックス追加のみ。
  *
- * @package Researchmap\RmNetCommons\Config\Migration
+ * @package NetCommons\Topics\Config\Migration
  */
 class AddIndex1769652195 extends CakeMigration {
 
@@ -25,8 +29,8 @@ class AddIndex1769652195 extends CakeMigration {
 					'indexes' => array(
 						'idx1_p_topics' => array('column' => array('category_id'), 'unique' => 0),
 						'idx2_p_topics' => array('column' => array('frame_id'), 'unique' => 0),
-						'idx3_p_topics' => array('column' => array('language_id', 'room_id','is_latest','is_active','is_in_room','created_user','public_type','publish_start','publish_end'), 'unique' => 0),
-						'idx4_p_topics' => array('column' => array('is_active', 'room_id','public_type','publish_start','publish_end','created_user','id','`plugin_key`(191)'), 'unique' => 0),
+						'idx3_p_topics' => array('column' => array('language_id', 'room_id', 'is_latest', 'is_active', 'is_in_room', 'created_user', 'public_type', 'publish_start', 'publish_end'), 'unique' => 0),
+						'idx4_p_topics' => array('column' => array('is_active', 'room_id', 'public_type', 'publish_start', 'publish_end', 'created_user', 'id', '`plugin_key`(191)'), 'unique' => 0),
 					),
 				),
 			),
diff --git a/Config/Schema/schema.php b/Config/Schema/schema.php
index 76a052e..2a2b4b2 100644
--- a/Config/Schema/schema.php
+++ b/Config/Schema/schema.php
@@ -239,8 +239,8 @@ public function after($event = array()) {
 			'search' => array('column' => array('search_contents'), 'type' => 'fulltext'),
 			'idx1_p_topics' => array('column' => array('category_id'), 'unique' => 0),
 			'idx2_p_topics' => array('column' => array('frame_id'), 'unique' => 0),
-			'idx3_p_topics' => array('column' => array('language_id', 'room_id','is_latest','is_active','is_in_room','created_user','public_type','publish_start','publish_end'), 'unique' => 0),
-			'idx4_p_topics' => array('column' => array('is_active', 'room_id','public_type','publish_start','publish_end','created_user','id','`plugin_key`(191)'), 'unique' => 0),
+			'idx3_p_topics' => array('column' => array('language_id', 'room_id', 'is_latest', 'is_active', 'is_in_room', 'created_user', 'public_type', 'publish_start', 'publish_end'), 'unique' => 0),
+			'idx4_p_topics' => array('column' => array('is_active', 'room_id', 'public_type', 'publish_start', 'publish_end', 'created_user', 'id', '`plugin_key`(191)'), 'unique' => 0),
 		),
 		'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'Mroonga', 'comment' => 'engine "InnoDB"')
 	);