***************
*** 430,436 ****
      $menu_name = variable_get(_taxonomy_menu_build_variable('vocab_menu', $term->vid), FALSE);
      $vocb_sync = variable_get(_taxonomy_menu_build_variable('sync', $term->vid), TRUE);
      $menu_num = variable_get(_taxonomy_menu_build_variable('display_num', $term->vid), TRUE);
-     $hide_empty = variable_get(_taxonomy_menu_build_variable('hide_empty_terms', $term->vid), FALSE);
      if ($menu_name && $vocb_sync && ($menu_num || $hide_empty)) {
        switch ($op) {
          case 'update':
--- 457,463 ----
      $menu_name = variable_get(_taxonomy_menu_build_variable('vocab_menu', $term->vid), FALSE);
      $vocb_sync = variable_get(_taxonomy_menu_build_variable('sync', $term->vid), TRUE);
      $menu_num = variable_get(_taxonomy_menu_build_variable('display_num', $term->vid), TRUE);
+     $hide_empty = variable_get('taxonomy_menu_hide_empty_terms_' . $term->vid, FALSE);
      if ($menu_name && $vocb_sync && ($menu_num || $hide_empty)) {
        switch ($op) {
          case 'update':
***************
*** 568,574 ****
        ? $item['description'] : $item['name'])),
      'weight' => $item['weight'],
      'module' => 'taxonomy_menu',
-     'expanded' => variable_get(_taxonomy_menu_build_variable('expanded', $item['vid']), TRUE),
      'link_path' => $path,
    );
  
--- 626,632 ----
        ? $item['description'] : $item['name'])),
      'weight' => $item['weight'],
      'module' => 'taxonomy_menu',
+     'expanded' => variable_get('taxonomy_menu_expanded_' . $item['vid'], TRUE),
      'link_path' => $path,
    );