diff --git a/src/gamecore/AbilityLink.vue b/src/gamecore/AbilityLink.vue
new file mode 100644
index 0000000..05ad384
--- /dev/null
+++ b/src/gamecore/AbilityLink.vue
@@ -0,0 +1,23 @@
+<script setup lang="ts">
+  import { inject } from 'vue';
+
+  defineProps<{abilityName:string|{Value:string}}>()
+  
+  const createAbilityRoute = inject<(key:string) => object>('createAbilityRoute') as (key:string) => object
+</script>
+
+<template>
+  <template v-if="typeof(abilityName) == 'string'">
+    <RouterLink v-if="abilityName" :to="createAbilityRoute(abilityName)">
+      <em>{{ abilityName }}</em>
+    </RouterLink>
+  </template>
+  <template v-else-if="typeof(abilityName) == 'object'">
+    <RouterLink v-if="abilityName.Value" :to="createAbilityRoute(abilityName.Value)">
+      <em>{{ abilityName.Value }}</em>
+    </RouterLink>
+  </template>
+</template>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/gamecore/tasks/AddStageAbilityByName.vue b/src/gamecore/tasks/AddStageAbilityByName.vue
index 2286e34..5b9b30a 100644
--- a/src/gamecore/tasks/AddStageAbilityByName.vue
+++ b/src/gamecore/tasks/AddStageAbilityByName.vue
@@ -1,24 +1,20 @@
 <script setup lang="ts">
-  import { inject } from 'vue';
   import { GamecoreTask, } from '@/sources/gamecore';
   import BlockLayout from '@/components/BlockLayout.vue';
+  import AbilityLink from '../AbilityLink.vue';
 
   const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     StageAbilityName:string
   }
-
-  const createAbilityRoute = inject<(key:string) => object>('createAbilityRoute') as (key:string) => object
 </script>
 
 <template>
   <BlockLayout :source="node">
    
     Add ability
-    <RouterLink :to="createAbilityRoute(node.StageAbilityName)">
-      <em>{{ node.StageAbilityName }}</em>
-    </RouterLink>
+    <AbilityLink :abilityName="node.StageAbilityName" />
     to the stage
 
   </BlockLayout>
diff --git a/src/gamecore/tasks/OwnerEntityAddAbility.vue b/src/gamecore/tasks/OwnerEntityAddAbility.vue
index 4a29239..0ad6bc2 100644
--- a/src/gamecore/tasks/OwnerEntityAddAbility.vue
+++ b/src/gamecore/tasks/OwnerEntityAddAbility.vue
@@ -1,24 +1,20 @@
 <script setup lang="ts">
-  import { inject } from 'vue';
   import { GamecoreTask, } from '@/sources/gamecore';
   import BlockLayout from '@/components/BlockLayout.vue';
+  import AbilityLink from '../AbilityLink.vue';
 
   const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
   {
     AbilityName:string
   }
-
-  const createAbilityRoute = inject<(key:string) => object>('createAbilityRoute') as (key:string) => object
 </script>
 
 <template>
   <BlockLayout :source="node">
    
     Add ability
-    <RouterLink :to="createAbilityRoute(node.AbilityName)">
-      <em>{{ node.AbilityName }}</em>
-    </RouterLink>
+    <AbilityLink :abilityName="node.AbilityName" />
     to the ability owner
 
   </BlockLayout>
diff --git a/src/gamecore/tasks/TriggerAbility.vue b/src/gamecore/tasks/TriggerAbility.vue
index 8225a89..0f78ae3 100644
--- a/src/gamecore/tasks/TriggerAbility.vue
+++ b/src/gamecore/tasks/TriggerAbility.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-  import { inject } from 'vue';
   import { GamecoreTask, GamecoreTargetType, } from '@/sources/gamecore';
   import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateTargetType from '../EvaluateTargetType.vue';
+  import AbilityLink from '../AbilityLink.vue';
 
   const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
@@ -11,8 +11,6 @@
     AbilityInherentTargetType?:GamecoreTargetType
     AbilityName:string
   }
-
-  const createAbilityRoute = inject<(key:string) => object>('createAbilityRoute') as (key:string) => object
 </script>
 
 <template>
@@ -24,9 +22,7 @@
     </template>
 
     ability
-    <RouterLink :to="createAbilityRoute(node.AbilityName)">
-      <em>{{ node.AbilityName }}</em>
-    </RouterLink>
+    <AbilityLink :abilityName="node.AbilityName" />
 
     <template v-if="node.AbilityInherentTargetType">
       targeting <em><EvaluateTargetType :target="node.AbilityInherentTargetType" /></em>
diff --git a/src/gamecore/tasks/TurnInsertAbility.vue b/src/gamecore/tasks/TurnInsertAbility.vue
index 3ea3e75..f0f9623 100644
--- a/src/gamecore/tasks/TurnInsertAbility.vue
+++ b/src/gamecore/tasks/TurnInsertAbility.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-  import { inject } from 'vue';
   import { GamecoreTask, GamecoreTargetType, } from '@/sources/gamecore';
   import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateTargetType from '../EvaluateTargetType.vue';
   import AnyTask from '../AnyTask.vue';
+  import AbilityLink from '../AbilityLink.vue';
 
   const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
@@ -16,17 +16,13 @@
     ShowInActionBar:boolean
     PreCheck?:GamecoreTask
   }
-
-  const createAbilityRoute = inject<(key:string) => object>('createAbilityRoute') as (key:string) => object
 </script>
 
 <template>
   <BlockLayout :source="node">
    
     Insert ability
-    <RouterLink :to="createAbilityRoute(node.AbilityName)">
-      <em>{{ node.AbilityName }}</em>
-    </RouterLink>
+    <AbilityLink :abilityName="node.AbilityName" />
     <template v-if="node.TargetType">
       for <em><EvaluateTargetType :target="node.TargetType" /></em>
     </template>
diff --git a/src/gamecore/tasks/TurnInsertAction.vue b/src/gamecore/tasks/TurnInsertAction.vue
index 915f93d..44ccdb6 100644
--- a/src/gamecore/tasks/TurnInsertAction.vue
+++ b/src/gamecore/tasks/TurnInsertAction.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-  import { inject } from 'vue';
   import { GamecoreTask, GamecoreTargetType, } from '@/sources/gamecore';
   import BlockLayout from '@/components/BlockLayout.vue';
   import EvaluateTargetType from '../EvaluateTargetType.vue';
+  import AbilityLink from '../AbilityLink.vue';
 
   const props = defineProps<{node:GamecoreTask}>()
   const node = props.node as unknown as 
@@ -15,17 +15,15 @@
     CanInsertUltraSkill?:boolean
     SkillTypeWhenDelayed?:string
   }
-
-  const createAbilityRoute = inject<(key:string) => object>('createAbilityRoute') as (key:string) => object
 </script>
 
 <template>
   <BlockLayout :source="node">
    
     Insert extra turn action
-    <RouterLink v-if="node.PrepareAbilityName" :to="createAbilityRoute(node.PrepareAbilityName)">
-      with ability <em>{{ node.PrepareAbilityName }}</em>
-    </RouterLink>
+    <template v-if="node.PrepareAbilityName">
+      with ability <AbilityLink :abilityName="node.PrepareAbilityName" />
+    </template>
     <template v-if="node.TargetType">
       for <em><EvaluateTargetType :target="node.TargetType" /></em>
     </template>