--- menutrails.module
+++ menutrails.module
@@ -86,10 +86,11 @@ function menutrails_nodeapi(&$node, $op, $a3 = NULL, $page = FALSE) {
 function menutrails_get_breadcrumbs() {
   $item = menu_get_item();
   // Give first priority to the selected menu.
-  $menu = variable_get('menutrails_menu', FALSE);
-  if (!$menu) {
-    $menu = db_result(db_query("SELECT menu_name FROM {menu_links} WHERE link_path = '%s' AND module = 'menu'", $item['href']));
-  }
+  $priority_menu = variable_get('menutrails_menu', variable_get('menu_primary_links_source', 'primary-links'));
+  $menu = db_result(db_query(
+    "SELECT menu_name FROM {menu_links} WHERE link_path = '%s' AND menu_name = '%s'
+    UNION SELECT menu_name FROM {menu_links} WHERE link_path = '%s'",
+  $item['href'], $priority_menu, $item['href']));
   $tree = menu_tree_page_data($menu);
   $crumbs = array(l(t('Home'), '<front>'));
   _menutrails_recurse_crumbs($tree, $item, $crumbs);