diff --git a/app/components/application_component.rb b/app/components/application_component.rb
index 78b7da075..7cf590297 100644
--- a/app/components/application_component.rb
+++ b/app/components/application_component.rb
@@ -1,5 +1,5 @@
 class ApplicationComponent < ViewComponent::Base
   include SettingsHelper
-  delegate :back_link_to, to: :helpers
+  delegate :back_link_to, :t, to: :helpers
   delegate :default_form_builder, to: :controller
 end
diff --git a/spec/components/application_component_spec.rb b/spec/components/application_component_spec.rb
new file mode 100644
index 000000000..f3458ed42
--- /dev/null
+++ b/spec/components/application_component_spec.rb
@@ -0,0 +1,21 @@
+require "rails_helper"
+
+describe ApplicationComponent do
+  it "uses custom translations if present" do
+    I18nContent.update([{ id: "shared.yes", values: { "value_en" => "Affirmative" }}])
+
+    component_class = Class.new(ApplicationComponent) do
+      def call
+        t("shared.yes")
+      end
+
+      def self.name
+        ""
+      end
+    end
+
+    render_inline component_class.new
+
+    expect(page).to be_rendered with: "<p>Affirmative</p>"
+  end
+end
diff --git a/spec/components/sdg/related_list_selector_component_spec.rb b/spec/components/sdg/related_list_selector_component_spec.rb
index 07f5893b1..de5cd772b 100644
--- a/spec/components/sdg/related_list_selector_component_spec.rb
+++ b/spec/components/sdg/related_list_selector_component_spec.rb
@@ -47,38 +47,44 @@ describe SDG::RelatedListSelectorComponent do
   end
 
   describe "#suggestion_tag_for" do
-    it "return suggestion tag for goal" do
-      suggestion = component.suggestion_tag_for(SDG::Goal[1])
+    it "sets suggestion tags for goals" do
+      allow(component).to receive(:goals_and_targets).and_return([SDG::Goal[1]])
 
-      expect(suggestion).to eq({
+      render_inline component
+
+      expect(page.find_field("Goals and Targets")["data-suggestions-list"]).to eq([{
         tag: "1. No Poverty",
         display_text: "SDG1",
         title: "No Poverty",
         value: 1
-      })
+      }].to_json)
     end
 
-    it "returns suggestion tag for global target" do
-      suggestion = component.suggestion_tag_for(SDG::Target[1.1])
+    it "sets suggestion tags for global targets" do
+      allow(component).to receive(:goals_and_targets).and_return([SDG::Target[1.1]])
 
-      expect(suggestion).to eq({
+      render_inline component
+
+      expect(page.find_field("Goals and Targets")["data-suggestions-list"]).to eq([{
         tag: "1.1. Eradicate Extreme Poverty",
         display_text: "1.1",
         title: "By 2030, eradicate extreme poverty for all people everywhere, currently measured as people living on less than $1.25 a day",
         value: "1.1"
-      })
+      }].to_json)
     end
 
-    it "returns suggestion tag for local target" do
+    it "sets suggestion tags for local targets" do
       create(:sdg_local_target, code: "1.1.1", title: "By 2030, eradicate extreme custom text")
-      suggestion = component.suggestion_tag_for(SDG::LocalTarget["1.1.1"])
+      allow(component).to receive(:goals_and_targets).and_return([SDG::LocalTarget["1.1.1"]])
 
-      expect(suggestion).to eq({
+      render_inline component
+
+      expect(page.find_field("Goals and Targets")["data-suggestions-list"]).to eq([{
         tag: "1.1.1. By 2030 eradicate extreme custom text",
         display_text: "1.1.1",
         title: "By 2030, eradicate extreme custom text",
         value: "1.1.1"
-      })
+      }].to_json)
     end
   end
 end