diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0c857aaf..741fc836 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -70,6 +70,7 @@ workflows:
             branches:
               only:
                 - develop
+                - fix/challenge-timelines-edit-routes
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.
diff --git a/src/common/helper.js b/src/common/helper.js
index 4d1e8abb..f0ab9e0b 100644
--- a/src/common/helper.js
+++ b/src/common/helper.js
@@ -1287,6 +1287,5 @@ module.exports = {
   sendSelfServiceNotification,
   getMemberByHandle,
   submitZendeskRequest,
-  getMemberById,
   updateSelfServiceProjectInfo
 }
diff --git a/src/controllers/ChallengeTimelineTemplateController.js b/src/controllers/ChallengeTimelineTemplateController.js
index 5b9a43fd..28eb54bb 100644
--- a/src/controllers/ChallengeTimelineTemplateController.js
+++ b/src/controllers/ChallengeTimelineTemplateController.js
@@ -32,7 +32,7 @@ async function createChallengeTimelineTemplate (req, res) {
  * @param {Object} res the response
  */
 async function getChallengeTimelineTemplate (req, res) {
-  const result = await service.getChallengeTimelineTemplate(req.params.challengeTypeTimelineTemplateId)
+  const result = await service.getChallengeTimelineTemplate(req.params.challengeTimelineTemplateId)
   res.send(result)
 }
 
@@ -42,7 +42,7 @@ async function getChallengeTimelineTemplate (req, res) {
  * @param {Object} res the response
  */
 async function fullyUpdateChallengeTimelineTemplate (req, res) {
-  const result = await service.fullyUpdateChallengeTimelineTemplate(req.params.challengeTypeTimelineTemplateId, req.body)
+  const result = await service.fullyUpdateChallengeTimelineTemplate(req.params.challengeTimelineTemplateId, req.body)
   res.send(result)
 }
 
@@ -52,7 +52,7 @@ async function fullyUpdateChallengeTimelineTemplate (req, res) {
  * @param {Object} res the response
  */
 async function deleteChallengeTimelineTemplate (req, res) {
-  const result = await service.deleteChallengeTimelineTemplate(req.params.challengeTypeTimelineTemplateId)
+  const result = await service.deleteChallengeTimelineTemplate(req.params.challengeTimelineTemplateId)
   res.send(result)
 }
 
diff --git a/src/services/ChallengeTimelineTemplateService.js b/src/services/ChallengeTimelineTemplateService.js
index 9390d139..a7484ef2 100644
--- a/src/services/ChallengeTimelineTemplateService.js
+++ b/src/services/ChallengeTimelineTemplateService.js
@@ -45,10 +45,10 @@ searchChallengeTimelineTemplates.schema = {
  */
 async function unsetDefaultTimelineTemplate (typeId, trackId) {
   const records = await searchChallengeTimelineTemplates({ typeId, trackId, isDefault: true })
-  if (records.length === 0) {
+  if (records.total === 0) {
     return
   }
-  for (const record of records) {
+  for (const record of records.result) {
     await fullyUpdateChallengeTimelineTemplate(record.id, { ...record, isDefault: false })
   }
 }
@@ -61,7 +61,7 @@ async function unsetDefaultTimelineTemplate (typeId, trackId) {
 async function createChallengeTimelineTemplate (data) {
   // check duplicate
   const records = await searchChallengeTimelineTemplates(data)
-  if (records.length > 0) {
+  if (records.total > 0) {
     throw new errors.ConflictError('The challenge type timeline template is already defined.')
   }
   // check exists
@@ -109,7 +109,6 @@ getChallengeTimelineTemplate.schema = {
  */
 async function fullyUpdateChallengeTimelineTemplate (challengeTimelineTemplateId, data) {
   const record = await helper.getById('ChallengeTimelineTemplate', challengeTimelineTemplateId)
-
   if (record.typeId === data.typeId &&
     record.trackId === data.trackId &&
     record.timelineTemplateId === data.timelineTemplateId &&
@@ -120,7 +119,7 @@ async function fullyUpdateChallengeTimelineTemplate (challengeTimelineTemplateId
 
   // check duplicate
   const records = await searchChallengeTimelineTemplates(data)
-  if (records.length > 0) {
+  if (records.total > 0) {
     throw new errors.ConflictError('The challenge type timeline template is already defined.')
   }
   // check exists