diff --git a/endpoints/logistics.tracking.php b/endpoints/logistics.tracking.php
index de44666..206a8e2 100644
--- a/endpoints/logistics.tracking.php
+++ b/endpoints/logistics.tracking.php
@@ -2,7 +2,7 @@
 
 $trackinginfo;
 
-$code = $VARS["code"];
+$code = urldecode($VARS["code"]);
 $carrier = "";
 if (!empty($VARS["carrier"])) {
     $carrier = $VARS["carrier"];
diff --git a/lib/Tracking_USPS_gsbarcode.lib.php b/lib/Tracking_USPS_gsbarcode.lib.php
index eebcd5c..762608a 100644
--- a/lib/Tracking_USPS_gsbarcode.lib.php
+++ b/lib/Tracking_USPS_gsbarcode.lib.php
@@ -14,8 +14,12 @@ class Tracking_USPS_gsbarcode {
             $code = substr($code, 1);
         }
         $codeparts = explode("\x1D", $code);
-
-        $realcode = $codeparts[1];
+        if (count($codeparts) == 1) {
+            $realcode = $codeparts[0];
+        } else {
+            // Has routing portion, let's skip that
+            $realcode = $codeparts[1];
+        }
 
         return Tracking::track($realcode, "usps");
     }