--- /sites/all/modules/nat/includes/nat.views.inc
+++ /sites/all/modules/nat/includes/nat.views.inc
@@ -21,6 +21,9 @@ function nat_views_handlers() {
       ),
       'nat_handler_argument_term_node_tid_depth_modifier' => array(
         'parent' => 'views_handler_argument'
+      ),
+      'nat_handler_field_term_node_tid' => array(
+        'parent' => 'views_handler_field_term_node_tid',
       )
     )
   );
@@ -152,4 +155,7 @@ function nat_views_data_alter(&$data) {
       'handler' => 'nat_handler_argument_term_node_tid_depth_modifier'
     )
   );
+
+  $data['term_node']['tid']['field']['handler'] = 'nat_handler_field_term_node_tid';
+
 }

+++ /sites/all/modules/nat/includes/nat_handler_field_term_node_tid.inc
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Field handler for terms.
+ */
+class nat_handler_field_term_node_tid extends views_handler_field_term_node_tid {
+  function option_definition() {
+    $options = parent::option_definition();
+    $options['link_to_node'] = array('default' => TRUE);
+    return $options;
+  }
+
+  /**
+   * Provide "link to node" option.
+   */
+  function options_form(&$form, &$form_state) {
+    parent::options_form($form, $form_state);
+    $form['link_to_node'] = array(
+      '#title' => t('Link this field to its node page'),
+      '#type' => 'checkbox',
+      '#default_value' => !empty($this->options['link_to_node']),
+    );
+  }
+
+  function pre_render($values) {
+    $this->field_alias = $this->aliases['vid'];
+    $vids = array();
+    foreach ($values as $result) {
+      if (!empty($result->{$this->aliases['vid']})) {
+        $vids[] = $result->{$this->aliases['vid']};
+      }
+    }
+
+    if ($vids) {
+      $voc = '';
+      if (!empty($this->options['limit']) && !empty($this->options['vids'])) {
+        $voc = " AND td.vid IN (" . implode(', ', array_keys(array_filter($this->options['vids']))) . ")";
+      }
+
+      $result = db_query("SELECT tn.vid AS node_vid, td.*, v.name AS vocabulary, n.nid as node_nid FROM {term_data} td INNER JOIN {term_node} tn ON td.tid = tn.tid INNER JOIN {vocabulary} v ON v.vid = td.vid LEFT JOIN {nat} n ON td.tid = n.tid WHERE tn.vid IN (" . implode(', ', $vids) . ")$voc ORDER BY td.weight, td.name");
+
+      while ($term = db_fetch_object($result)) {
+        $this->items[$term->node_vid][$term->tid]['name'] = check_plain($term->name);
+        $this->items[$term->node_vid][$term->tid]['tid'] = $term->tid;
+        $this->items[$term->node_vid][$term->tid]['vid'] = $term->vid;
+        $this->items[$term->node_vid][$term->tid]['vocabulary'] = check_plain($term->vocabulary);
+        
+        if (!empty($this->options['link_to_taxonomy'])) {
+          $this->items[$term->node_vid][$term->tid]['make_link'] = TRUE;
+          $this->items[$term->node_vid][$term->tid]['path'] = taxonomy_term_path($term);
+        }        
+
+        if (!empty($this->options['link_to_node'])) {
+          $this->items[$term->node_vid][$term->tid]['make_link'] = TRUE;
+          if ($term->node_nid) {
+            $this->items[$term->node_vid][$term->tid]['path'] = 'node/' . $term->node_nid;
+          }
+        }
+      }
+    }
+  }
+
+}
+