--- menutrails.module	2011-02-02 17:13:01.628649495 +0000
+++ menutrails.module.mod	2011-02-02 17:11:20.982914022 +0000
@@ -125,12 +125,18 @@ function menutrails_node_location($node)
   $item = menu_get_item();
   if (db_result(db_query("SELECT count(mlid) FROM {menu_links} WHERE link_path = '%s' AND module = 'menu'", $item['href'])) == 0) {
     $type_trails = variable_get('menutrails_node_types', array());
-    $href        = $type_trails[$node->type] ? $type_trails[$node->type] : FALSE;
+    if ($type_trails[$node->type]) {
+      $parts = explode(':', $type_trails[$node->type]);
+      $href = $parts[1];
+    } else {
+      $href = false;
+    }
     $term_trails = variable_get('menutrails_terms', array());
     if (!empty($node->taxonomy)) {
       foreach ($node->taxonomy as $term) {
         if (!empty($term_trails[$term->tid])) {
-          $href = $term_trails[$term->tid];
+          $parts = explode(':', $term_trails[$term->tid]);
+          $href = $parts[1];
         }
       }
     }
@@ -351,8 +357,8 @@ function menutrails_token_values($type, 
       foreach ($trail_raw as $title) {
         $trail[] = check_plain($title);
       }
-      $tokens['menu-trail-parents-path-raw'] = !empty($options['pathauto']) ? $trail_raw : implode('/', $trail_raw);
-      $tokens['menu-trail-parents-path'] = !empty($options['pathauto']) ? $trail : implode('/', $trail);
+      $tokens['menu-trail-parents-path-raw'] = implode('/', $trail_raw);
+      $tokens['menu-trail-parents-path'] = implode('/', $trail);
     }
     // Return NULL in case there is no trail.
     else {
@@ -385,7 +391,7 @@ function _menutrails_parents_recurse($tr
     if ($data['link']['mlid'] != $exclude && $data['link']['hidden'] >= 0) {
       $title = $indent .' '. truncate_utf8($data['link']['title'], 30, TRUE, FALSE);
       if (!$data['link']['hidden']) {
-        $options[$menu_name][$data['link']['href']] = $title;
+        $options[$menu_name][$data['link']['mlid'].':'.$data['link']['href']] = $title;
       }
       if ($data['below']) {
         _menutrails_parents_recurse($data['below'], $menu_name, $indent .'--', $options, $exclude, $depth_limit);