Index: C:/xampp/htdocs/vhosts/m29office/www/sites/all/modules/cck/modules/nodereference/nodereference.module
===================================================================
--- C:/xampp/htdocs/vhosts/m29office/www/sites/all/modules/cck/modules/nodereference/nodereference.module	(revision 35)
+++ C:/xampp/htdocs/vhosts/m29office/www/sites/all/modules/cck/modules/nodereference/nodereference.module	(working copy)
@@ -607,12 +607,26 @@
  */
 function nodereference_allowed_values($field) {
   $references = _nodereference_potential_references($field);
-
+	
   $options = array();
   foreach ($references as $key => $value) {
     // Views theming runs check_plain (htmlentities) on the values.
     // We reverse that with html_entity_decode.
-    $options[$key] = html_entity_decode(strip_tags($value['rendered']));
+    if(!isset($value['rendered'])){
+      if($field['widget']['type'] == 'nodereference_select'){
+        foreach($value as $k2 => $v2){
+          $options[$key][html_entity_decode(strip_tags($k2))] = html_entity_decode(strip_tags($v2['rendered']));
+        }
+      }
+      else{
+        foreach($value as $k2 => $v2){
+          $options[$k2] = html_entity_decode(strip_tags($v2['rendered']));
+        }
+      }
+    }
+    else{
+      $options[$key] = html_entity_decode(strip_tags($value['rendered']));
+    }
   }
   return $options;
 }
@@ -773,9 +787,21 @@
   $matches = array();
 
   $references = _nodereference_potential_references($field, $string);
+
   foreach ($references as $id => $row) {
+    // Views theming runs check_plain (htmlentities) on the values.
+    // We reverse that with html_entity_decode.
+    if(!isset($row['rendered'])){
+      foreach($row as $k2 => $v2){
+         $matches[$v2['title'] ." [nid:$k2]"] = '<div class="nodereference-autocomplete">'. $v2['rendered'] . '</div>';
+      }
+    }
+    else{
+       $matches[$row['title'] ." [nid:$id]"] = '<div class="nodereference-autocomplete">'. $row['rendered'] . '</div>';
+    }
+  
     // Add a class wrapper for a few required CSS overrides.
-    $matches[$row['title'] ." [nid:$id]"] = '<div class="nodereference-autocomplete">'. $row['rendered'] . '</div>';
+   
   }
   drupal_json($matches);
 }
Index: C:/xampp/htdocs/vhosts/m29office/www/sites/all/modules/cck/modules/nodereference/nodereference.views.inc
===================================================================
--- C:/xampp/htdocs/vhosts/m29office/www/sites/all/modules/cck/modules/nodereference/nodereference.views.inc	(revision 35)
+++ C:/xampp/htdocs/vhosts/m29office/www/sites/all/modules/cck/modules/nodereference/nodereference.views.inc	(working copy)
@@ -69,14 +69,26 @@
 
     // TODO : We don't display grouping info for now.
     // Could be useful for select widget, though.
-    foreach ($sets as $title => $records) {
-      foreach ($records as $label => $row) {
-        $results[$row->{$base_field}] = array(
-          'title' => $row->{$title_field},
-          'rendered' => $this->row_plugin->render($row),
-        );
+    if($this->options['grouping']){
+      foreach ($sets as $title => $records) {
+        foreach ($records as $label => $row) {
+          $results[$title][$row->{$base_field}] = array(
+            'title' => $row->{$title_field},
+            'rendered' => $this->row_plugin->render($row),
+          );
+        }
       }
     }
+    else{
+      foreach ($sets as $title => $records) {
+        foreach ($records as $label => $row) {
+          $results[$row->{$base_field}] = array(
+            'title' => $row->{$title_field},
+            'rendered' => $this->row_plugin->render($row),
+          );
+        }
+      }
+    }
     return $results;
   }
 
@@ -101,4 +113,4 @@
 //    }
 //    return $results;
 //  }
-}
+}
\ No newline at end of file