diff --git a/htdocs/sites/all/modules/flag_page/includes/views_handler_field_flag_page_link.inc b/htdocs/sites/all/modules/flag_page/includes/views_handler_field_flag_page_link.inc
index e598ef8..feedc8b 100644
--- a/htdocs/sites/all/modules/flag_page/includes/views_handler_field_flag_page_link.inc
+++ b/htdocs/sites/all/modules/flag_page/includes/views_handler_field_flag_page_link.inc
@@ -14,6 +14,8 @@ class views_handler_field_flag_page_link extends views_handler_field {
 
   function render($values) {
     $url = $values->{$this->aliases['url']};
+    $url = parse_url($url);
+
     // If the flag has user overridden titles use this
     if (isset($values->{$this->aliases['user_title']})) {
       $title = check_plain($values->{$this->aliases['user_title']});
@@ -21,7 +23,8 @@ class views_handler_field_flag_page_link extends views_handler_field {
     else {
       $title = check_plain($values->{$this->aliases['title']});
     }
-    return l($title, $url, array('class' => 'flag_page_link'));
+    
+    return l($title, $url['path'], array('class' => 'flag_page_link', 'query' => $url['query']));
   }
 
   function query() {