diff --git sites/all/modules/shorturl/shorturl.module sites/all/modules/shorturl/shorturl.module
index fd74c08..956589f 100644
--- sites/all/modules/shorturl/shorturl.module
+++ sites/all/modules/shorturl/shorturl.module
@@ -16,8 +16,24 @@ function shorturl_init() {
 
   require_once (dirname(__FILE__) . '/shorturl.engine.inc');
   $token = $_GET['q'];
+  $incoming_query_strings = $_GET;
+  unset($incoming_query_strings['q']);
+
+  if (count($incoming_query_strings) > 0) {
+    $query_strings = '';
+    foreach ($incoming_query_strings as $key => $value) {
+      $query_strings .= '' . $key;
+      if (!empty($value)) {
+        $query_strings .= '=' . $value;
+      }
+      $query_strings .= '&';
+    }
+    $query_strings = substr_replace($query_strings, "", -1);
+  }
+
   if (!empty($token)) {
     $indx = shorturl_decode_url($token);
+
     if (is_numeric($indx)) {
       $orig_url = db_result(db_query('SELECT orig_url FROM {shorturl_link} WHERE lid=%d ', $indx));
     }
@@ -25,14 +41,21 @@ function shorturl_init() {
     if (!empty($orig_url)) {
       if (stripos($orig_url, 'http') === FALSE && 
           stripos($orig_url, 'https') === FALSE) {
-        $orig_url = url($orig_url, array('absolute'=>TRUE)); //Let drupal make relative URLs absolute
+        // Let drupal make relative URLs absolute.
+        $orig_url = url($orig_url, array('absolute' => TRUE));
       }
-      
-      drupal_goto($orig_url,  $query = NULL, $fragment = NULL, $http_response_code = 301);
-      exit();      
+
+      if (count($incoming_query_strings) > 0) {
+        $compound_url = $orig_url . '?' . $query_strings;
+      }
+      else {
+        $compound_url = $orig_url;
+      }
+
+      drupal_goto($compound_url, $query = NULL, $fragment = NULL, $http_response_code = 301);
+      exit();
     }
   }
-  
 }
 
 /** 
