diff --git a/app/helpers/value-field-link.js b/app/helpers/value-field-link.js
new file mode 100644
index 00000000000..556e77af9c5
--- /dev/null
+++ b/app/helpers/value-field-link.js
@@ -0,0 +1,12 @@
+import { helper } from '@ember/component/helper';
+import { htmlSafe } from '@ember/string';
+
+export function valueFieldLink(data) {
+  let field = '';
+  if(data){
+    field = data;  
+  }
+  return htmlSafe(field);
+}
+
+export default helper(valueFieldLink);
diff --git a/app/templates/components/forms/wizard/badge-field-form.hbs b/app/templates/components/forms/wizard/badge-field-form.hbs
index e7ee8dbe77a..7088924abaa 100644
--- a/app/templates/components/forms/wizard/badge-field-form.hbs
+++ b/app/templates/components/forms/wizard/badge-field-form.hbs
@@ -40,7 +40,7 @@
           <i class="dropdown icon"></i>
             {{#if this.data.custom_field}}
             <div class="default">
-              {{t-var this.data.custom_field}}
+              {{value-field-link (t-var this.data.custom_field)}}
               </div>
             {{else}}
             <div class="default text">
@@ -55,8 +55,8 @@
                 </div>
               {{else}}
                 {{#if cfield.isComplex}}
-                  <div class=" item complex-item" data-value="{{cfield.isComplex}}">
-                    {{rich-text-link cfield.isComplex}}
+                  <div class=" item complex-item" data-value="{{value-field-link cfield.isComplex}}">
+                    {{value-field-link cfield.isComplex}}
                   </div>
                 {{/if}}
               {{/if}}
@@ -85,7 +85,7 @@
               {{#each this.getQrFields as |field|}}
               {{#if field}}
               <div data-value="{{map-value mapper field.fieldIdentifier}}" class="item">
-                {{field.name}}
+                {{value-field-link field.name}}
               </div>
               {{/if}}
               {{/each}}