diff --git a/src/controllers/SalaryFormulaEmployeeController.ts b/src/controllers/SalaryFormulaEmployeeController.ts
index e416717..690ac91 100644
--- a/src/controllers/SalaryFormulaEmployeeController.ts
+++ b/src/controllers/SalaryFormulaEmployeeController.ts
@@ -251,6 +251,7 @@ export class SalaryFormulaEmployeeController extends Controller {
               { details: Like(`%${keyword}%`) },
               { position: Like(`%${keyword}%`) },
               { posLevel: { posLevelName: Like(`%${keyword}%`) } },
+              { posType: { posTypeName: Like(`%${keyword}%`) } },
             ],
       )
       .andWhere(posTypeId == undefined ? "1=1" : { posTypeId: Like(`%${posTypeId}%`) })
diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index 666da68..22c4ecc 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -1215,6 +1215,8 @@ export class SalaryPeriodController extends Controller {
                   .orWhere("profile.prefix LIKE :keyword", { keyword: `%${body.keyword}%` })
                   .orWhere("profile.firstName LIKE :keyword", { keyword: `%${body.keyword}%` })
                   .orWhere("profile.lastName LIKE :keyword", { keyword: `%${body.keyword}%` })
+                  .orWhere("CONCAT(profile.prefix,profile.firstName,' ',profile.lastName) LIKE :keyword", { keyword: `%${body.keyword}%` })
+                  .orWhere("CONCAT(profile.orgShortName,profile.posMasterNo) LIKE :keyword", { keyword: `%${body.keyword}%` })
                   //   .orWhere("profile.citizenId LIKE :keyword", { keyword: `%${body.keyword}%` })
                   .orWhere("profile.position LIKE :keyword", { keyword: `%${body.keyword}%` })
                   //   .orWhere("profile.posType LIKE :keyword", { keyword: `%${body.keyword}%` })
@@ -2042,7 +2044,8 @@ export class SalaryPeriodController extends Controller {
         "salaryPeriod.year",
         "salaryPeriod.revisionId",
       ])
-      .orderBy("salaryPeriod.effectiveDate", "DESC")
+      .orderBy("salaryPeriod.year", "DESC")
+      .addOrderBy("salaryPeriod.effectiveDate", "DESC")
       .skip((page - 1) * pageSize)
       .take(pageSize)
       .getManyAndCount();
diff --git a/src/controllers/SalaryPeriodEmployeeController.ts b/src/controllers/SalaryPeriodEmployeeController.ts
index ee556f5..c28390f 100644
--- a/src/controllers/SalaryPeriodEmployeeController.ts
+++ b/src/controllers/SalaryPeriodEmployeeController.ts
@@ -893,6 +893,8 @@ export class SalaryPeriodEmployeeController extends Controller {
                   .orWhere("profile.prefix LIKE :keyword", { keyword: `%${body.keyword}%` })
                   .orWhere("profile.firstName LIKE :keyword", { keyword: `%${body.keyword}%` })
                   .orWhere("profile.lastName LIKE :keyword", { keyword: `%${body.keyword}%` })
+                  .orWhere("CONCAT(profile.prefix,profile.firstName,' ',profile.lastName) LIKE :keyword", { keyword: `%${body.keyword}%` })
+                  .orWhere("CONCAT(profile.orgShortName,profile.posMasterNo) LIKE :keyword", { keyword: `%${body.keyword}%` })
                   //   .orWhere("profile.citizenId LIKE :keyword", { keyword: `%${body.keyword}%` })
                   .orWhere("profile.position LIKE :keyword", { keyword: `%${body.keyword}%` })
                   //   .orWhere("profile.posType LIKE :keyword", { keyword: `%${body.keyword}%` })