diff --git a/lib/interface/cli/commands/trigger/get.cmd.js b/lib/interface/cli/commands/trigger/get.cmd.js
index 514eef640..27f4ebd0d 100644
--- a/lib/interface/cli/commands/trigger/get.cmd.js
+++ b/lib/interface/cli/commands/trigger/get.cmd.js
@@ -16,10 +16,10 @@ const command = new Command({
     },
     builder: (yargs) => {
         yargs
-            .optional('pipeline', {
+            .option('pipeline', {
                 describe: 'pipeline id',
             })
-            .optional('event-uri', {
+            .option('event-uri', {
                 describe: 'event URI',
             });
     },
diff --git a/lib/interface/cli/commands/trigger/link.cmd.js b/lib/interface/cli/commands/trigger/link.cmd.js
index f97a6f402..7e5c66e40 100644
--- a/lib/interface/cli/commands/trigger/link.cmd.js
+++ b/lib/interface/cli/commands/trigger/link.cmd.js
@@ -30,7 +30,7 @@ const command = new Command({
         const eventURI = argv['event-uri'];
         /* eslint-enable prefer-destructuring */
         await trigger.createTrigger(eventURI, pipeline);
-        console.log(`Trigger: ${eventURI} was successfully linked to the pipeline(s): ${pipeline}`);
+        console.log(`Trigger: ${eventURI} was successfully linked to the pipeline: ${pipeline}`);
     },
 });
 
diff --git a/lib/logic/api/image.js b/lib/logic/api/image.js
index 2a670d5a5..405dc9830 100644
--- a/lib/logic/api/image.js
+++ b/lib/logic/api/image.js
@@ -139,7 +139,7 @@ const annotateImage = async (dockerImageId, annotations) => {
 };
 
 const addImageTag = async (options) => {
-    const image = await getImageById({ imageId: options.imageId });
+    const image = await getImageById({ id: options.imageId });
     const imageId = image[0].info._id;
     const RequestOptions = {
         url: `/api/images/${encodeURIComponent(imageId)}/tag/${options.tag}`,
@@ -149,7 +149,7 @@ const addImageTag = async (options) => {
 };
 
 const untagImage = async (options) => {
-    const images = await getImageById({ imageId: options.imageId });
+    const images = await getImageById({ id: options.imageId });
     const imageId = images[0].info._id;
     const image = _.find(images, currimage => _.isEqual(currimage.info.tag, options.tag));
     if (image) {