diff --git a/src/scripts/linking/find-best-target.lua b/src/scripts/linking/find-best-target.lua
index cab8ea61..adaa63ca 100644
--- a/src/scripts/linking/find-best-target.lua
+++ b/src/scripts/linking/find-best-target.lua
@@ -13,7 +13,11 @@ log = Log.open_topic ("s-linking")
 
 SimpleEventHook {
   name = "linking/find-best-target",
-  after = "linking/find-default-target",
+  after = { "linking/find-defined-target",
+            "linking/find-filter-target",
+            "linking/find-media-role-target",
+            "linking/find-default-target" },
+  before = "linking/prepare-link",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/find-default-target.lua b/src/scripts/linking/find-default-target.lua
index eba3fc31..f3c455fa 100644
--- a/src/scripts/linking/find-default-target.lua
+++ b/src/scripts/linking/find-default-target.lua
@@ -11,7 +11,10 @@ log = Log.open_topic ("s-linking")
 
 SimpleEventHook {
   name = "linking/find-default-target",
-  after = "linking/find-media-role-target",
+  after = { "linking/find-defined-target",
+            "linking/find-filter-target",
+            "linking/find-media-role-target" },
+  before = "linking/prepare-link",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/find-defined-target.lua b/src/scripts/linking/find-defined-target.lua
index f027cf5b..f19124f9 100644
--- a/src/scripts/linking/find-defined-target.lua
+++ b/src/scripts/linking/find-defined-target.lua
@@ -15,6 +15,7 @@ log = Log.open_topic ("s-linking")
 
 SimpleEventHook {
   name = "linking/find-defined-target",
+  before = "linking/prepare-link",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/find-filter-target.lua b/src/scripts/linking/find-filter-target.lua
index 550370c4..02d5c2b3 100644
--- a/src/scripts/linking/find-filter-target.lua
+++ b/src/scripts/linking/find-filter-target.lua
@@ -34,6 +34,7 @@ end
 SimpleEventHook {
   name = "linking/find-filter-target",
   after = "linking/find-defined-target",
+  before = "linking/prepare-link",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/find-media-role-target.lua b/src/scripts/linking/find-media-role-target.lua
index bdd6b023..d654b0c2 100644
--- a/src/scripts/linking/find-media-role-target.lua
+++ b/src/scripts/linking/find-media-role-target.lua
@@ -12,7 +12,9 @@ log = Log.open_topic("s-linking")
 
 SimpleEventHook {
   name = "linking/find-media-role-target",
-  after = "linking/find-filter-target",
+  after = { "linking/find-defined-target",
+            "linking/find-filter-target" },
+  before = "linking/prepare-link",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/get-filter-from-target.lua b/src/scripts/linking/get-filter-from-target.lua
index 15d092d7..58ac7c1b 100644
--- a/src/scripts/linking/get-filter-from-target.lua
+++ b/src/scripts/linking/get-filter-from-target.lua
@@ -13,7 +13,12 @@ log = Log.open_topic ("s-linking")
 
 SimpleEventHook {
   name = "linking/get-filter-from-target",
-  after = "linking/find-best-target",
+  after = { "linking/find-defined-target",
+            "linking/find-filter-target",
+            "linking/find-media-role-target",
+            "linking/find-default-target",
+            "linking/find-best-target" },
+  before = "linking/prepare-link",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },
diff --git a/src/scripts/linking/prepare-link.lua b/src/scripts/linking/prepare-link.lua
index 6a6ccbe1..69da939c 100644
--- a/src/scripts/linking/prepare-link.lua
+++ b/src/scripts/linking/prepare-link.lua
@@ -14,7 +14,6 @@ log = Log.open_topic ("s-linking")
 
 SimpleEventHook {
   name = "linking/prepare-link",
-  after = "linking/get-filter-from-target",
   interests = {
     EventInterest {
       Constraint { "event.type", "=", "select-target" },