diff --git a/lib/admin/Controller/billing.pm b/lib/admin/Controller/billing.pm
index d9cef8c..87da4d0 100644
--- a/lib/admin/Controller/billing.pm
+++ b/lib/admin/Controller/billing.pm
@@ -3,6 +3,7 @@ package admin::Controller::billing;
 use strict;
 use warnings;
 use base 'Catalyst::Controller';
+use URI::Escape;
 
 my @WEEKDAYS = qw(Monday Tuesday Wednesday Thursday Friday Saturday Sunday);
 
@@ -452,6 +453,9 @@ sub search_fees : Local {
 
     $c->stash->{searched} = 1;
     if(ref $$fee_list{fees} eq 'ARRAY' and @{$$fee_list{fees}}) {
+        for(@{$$fee_list{fees}}) {
+            $$_{urlenc_destination} = uri_escape($$_{destination});
+        }
         $c->stash->{fee_list} = $$fee_list{fees};
         $c->stash->{total_count} = $$fee_list{total_count};
         $c->stash->{offset} = $offset;
diff --git a/root/tt/billing_fees.tt b/root/tt/billing_fees.tt
index e077f43..0f9e57d 100644
--- a/root/tt/billing_fees.tt
+++ b/root/tt/billing_fees.tt
@@ -109,10 +109,10 @@
                 <td>[% fee.zone_detail %]</td>
               [% UNLESS Catalyst.session.admin.read_only %]
                 <td>
-                  <a href="/billing/edit_fee?bilprof=[% bilprof.handle %]&amp;destination=[% fee.destination %]&amp;offset=[% offset %]"><span class="button-edit">Edit</span></a>
+                  <a href="/billing/edit_fee?bilprof=[% bilprof.handle %]&amp;destination=[% fee.urlenc_destination %]&amp;offset=[% offset %]"><span class="button-edit">Edit</span></a>
                 </td>
                 <td>
-                  <a href="/billing/do_delete_fee?bilprof=[% bilprof.handle %]&amp;destination=[% fee.destination %]&amp;offset=[% offset %][% IF last_one %]&amp;last_one=1[% END %]"><span class="button-delete">Delete</span></a>
+                  <a href="/billing/do_delete_fee?bilprof=[% bilprof.handle %]&amp;destination=[% fee.urlenc_destination %]&amp;offset=[% offset %][% IF last_one %]&amp;last_one=1[% END %]"><span class="button-delete">Delete</span></a>
                 </td>
               [% ELSE %]
                 <td />