diff --git a/a/facetapi/plugins/facetapi/url_processor_pretty_paths.inc b/b/facetapi/plugins/facetapi/url_processor_pretty_paths.inc
index 804f795..4311471 100644
--- a/a/facetapi/plugins/facetapi/url_processor_pretty_paths.inc
+++ b/b/facetapi/plugins/facetapi/url_processor_pretty_paths.inc
@@ -20,10 +20,21 @@ class FacetapiUrlProcessorPrettyPaths extends FacetapiUrlProcessor {
   /**
    * Implements FacetapiUrlProcessor::fetchParams().
    *
-   * Pulls facet params from the $_GET variable.
+   * Pulls facet params from the args.
    */
   public function fetchParams() {
-    return $_GET;
+    $params = array('f' => array(), 'q' => $_GET['q']);
+    $args = explode('/', $_GET['q']);
+    $facets = $this->adapter->getEnabledFacets();
+    while ($term = array_pop($args)) {
+      $tid = array_pop(explode('-', $term));
+      $vocab = array_pop($args);
+      foreach ($facets as $alias => $facet) {
+	if ($facet['label'] == $vocab)
+	  $params['f'][] = $alias . ':' . $tid;
+      }
+    }
+    return $params;
   }
 
   /**
@@ -46,7 +57,7 @@ class FacetapiUrlProcessorPrettyPaths extends FacetapiUrlProcessor {
     // Appends to qstring if inactive, removes if active.
     foreach ($values as $value) {
       if ($active && isset($active_items[$value])) {
-        $this->pathSegments[$value] = $this->getPathSegment($facet['field alias'], $value);
+        $this->pathSegments[$value] = $this->getPathSegment($facet['field api name'], $value);
         unset($qstring[$this->filterKey][$active_items[$value]['pos']]);
       }
       elseif (!$active) {
@@ -136,7 +147,7 @@ class FacetapiUrlProcessorPrettyPaths extends FacetapiUrlProcessor {
 
       // Add current facet to path if it is inactive.
       if (!$item['#active']) {
-        $segments[$tid] = $this->getPathSegment($facet['field alias'], $tid);
+        $segments[$tid] = $this->getPathSegment($facet['field api name'], $tid);
       }
       // Remove current facet from url if it is active.
       else {
@@ -152,6 +163,8 @@ class FacetapiUrlProcessorPrettyPaths extends FacetapiUrlProcessor {
 
         $item['#path'] .= $path;
       }
+      // Now remove the un-pretty query
+      unset($item['#query']);
     }
   }