diff --git a/block_titlelink.module b/block_titlelink.module
index 1adbfde..63fd4b1 100644
--- a/block_titlelink.module
+++ b/block_titlelink.module
@@ -149,7 +149,11 @@ function block_titlelink_preprocess_block(&$vars) {
       if(!empty($vars['block']->title_link_target)) {
         $options['attributes']['target'] = $vars['block']->title_link_target;
       }
-      $vars['block']->subject = l(t($vars['block']->subject), $vars['block']->title_link, $options);
+      $url = parse_url($vars['block']->title_link);
+      if (isset($url['query'])) {
+        parse_str($url['query'], $options['query']);
+      }
+      $vars['block']->subject = l(t($vars['block']->subject), $url['path'], $options);
     }
   }
 }