diff --git a/src/config.js b/src/config.js
index 599dc29..0b8725a 100644
--- a/src/config.js
+++ b/src/config.js
@@ -84,12 +84,12 @@ module.exports.frontendConfigs = {
   GITHUB_TEAM_URL: process.env.GITHUB_TEAM_URL || 'https://github.com/orgs/',
   GITLAB_GROUP_URL: process.env.GITLAB_GROUP_URL || 'https://gitlab.com/groups/',
   TC_API_V5_URL: process.env.TC_API_V5_URL || 'https://api.topcoder-dev.com/v5',
-  TC_API_V4_URL: {
+  TOPCODER_VALUES: {
     dev: {
-      process.env.TC_API_V4_URL || 'https://api.topcoder-dev.com/v4',
+      TC_API_V4_URL: process.env.TC_API_V4_URL || 'https://api.topcoder-dev.com/v4',
     },
     prod: {
-      process.env.TC_API_V4_URL || 'https://api.topcoder.com/v4',
+      TC_API_V4_URL: process.env.TC_API_V4_URL || 'https://api.topcoder.com/v4',
     },
   },
   TOPCODER_ENV: process.env.TOPCODER_ENV || 'dev',
diff --git a/src/front/src/app/projects/project.service.js b/src/front/src/app/projects/project.service.js
index 523ab4b..3f8543c 100644
--- a/src/front/src/app/projects/project.service.js
+++ b/src/front/src/app/projects/project.service.js
@@ -184,7 +184,7 @@ angular.module('topcoderX')
     ProjectService.getTags = function() {
       return $http({
         method: 'GET',
-        url: $rootScope.appConfig.TC_API_V4_URL[$rootScope.appConfig.TOPCODER_ENV] + '/technologies,
+        url: $rootScope.appConfig.TOPCODER_VALUES[$rootScope.appConfig.TOPCODER_ENV].TC_API_V4_URL + '/technologies',
         headers: {
           "Content-Type": "application/json",
           "Authorization": "Bearer " + AuthService.getTokenV3()
diff --git a/src/front/src/app/upsertproject/upsertproject.html b/src/front/src/app/upsertproject/upsertproject.html
index ab6ec5c..10fb507 100644
--- a/src/front/src/app/upsertproject/upsertproject.html
+++ b/src/front/src/app/upsertproject/upsertproject.html
@@ -78,10 +78,7 @@ <h2>{{title}}</h2>
             <br />
             <br />
             <label class="form-label">Tags:</label>
-            <!-- TODO: care about order or not
             <ui-select multiple ng-model="project.tags" theme="bootstrap" close-on-select="false" on-select="$select.selected.sort()">
-            -->
-            <ui-select multiple ng-model="project.tags" theme="bootstrap" close-on-select="false">
               <ui-select-match placeholder="Select...">
                 {{$item}}
               </ui-select-match>
diff --git a/src/services/ProjectService.js b/src/services/ProjectService.js
index 13f7e2e..fcfc7b3 100644
--- a/src/services/ProjectService.js
+++ b/src/services/ProjectService.js
@@ -159,13 +159,13 @@ async function _createOrMigrateRepository(repoUrl, project, currentUser) {
       );
 
       await createHook({projectId: project.id}, currentUser, repoUrl);
+
+      const oldProject = await dbHelper.getById(models.Project, oldRepo.projectId);
+      return _.isEqual(oldProject.tags, project.tags) ? [] : challengeUUIDs;
     }
     catch (err) {
       throw new Error(`Update ProjectId for Repository, Issue, CopilotPayment failed. Repo ${repoUrl}. Internal Error: ${err}`);
     }
-
-    const oldProject = await dbHelper.getById(models.Project, oldRepo.projectId);
-    return _.isEqual(oldProject.tags, project.tags) ? [] : challengeUUIDs;
   } else {
     try {
       await dbHelper.create(models.Repository, {