diff --git a/templates/CRM/Fieldconditions/Page/ListFieldFilterValues.tpl b/templates/CRM/Fieldconditions/Page/ListFieldFilterValues.tpl
index 018b8226fb7c9002284ce99914faa75ca01106ac..fa4fd5825b92dfff9c1cca68fce29775f72266b4 100644
--- a/templates/CRM/Fieldconditions/Page/ListFieldFilterValues.tpl
+++ b/templates/CRM/Fieldconditions/Page/ListFieldFilterValues.tpl
@@ -25,5 +25,5 @@
 {/foreach}
 </table>
 
-<div style="padding: 1em;"><a href="/civicrm/admin/fieldconditions/filter-values/edit?reset=1&map_id={$map_id}" class="button action-item"><span><span class="icon ui-icon-circle-plus"></span> Add new</span></a></div>
+  <div style="padding: 1em;"><a href="{crmURL p='civicrm/admin/fieldconditions/filter-values/edit' q="reset=1&map_id=`$map_id`"}" class="button action-item"><span><span class="icon ui-icon-circle-plus"></span> Add new field filter value</span></a></div>
 {/crmScope}
diff --git a/templates/CRM/Fieldconditions/Page/ListFields.tpl b/templates/CRM/Fieldconditions/Page/ListFields.tpl
index 92d64dc781ef6fddc1f0c7b7df28f0f29e6d71d2..cd26523aaf9d555a3e7e31bfd52fe506fca0be88 100644
--- a/templates/CRM/Fieldconditions/Page/ListFields.tpl
+++ b/templates/CRM/Fieldconditions/Page/ListFields.tpl
@@ -16,4 +16,4 @@
 {/foreach}
 </table>
 
-<div style="padding: 1em;"><a href="/civicrm/admin/fieldconditions/fields/add?reset=1&map_id={$map_id}" class="button action-item"><span><span class="icon ui-icon-circle-plus"></span> Add new field</span></a></div>
+<div style="padding: 1em;"><a href="{crmURL p='civicrm/admin/fieldconditions/fields/add' q="reset=1&map_id=`$map_id`"}" class="button action-item"><span><span class="icon ui-icon-circle-plus"></span> Add new field</span></a></div>