--- ymaps0.module	Fri Feb 25 02:11:38 2011
+++ ymaps.module	Sun Aug 28 18:46:27 2011
@@ -402,6 +402,7 @@ function ymaps_get_node_markers($node, $
     $markers['teaser'] = $node->teaser;
     $markers['title'] = $node->title;
     $markers['ischild'] = $ischild;
+    $markers['node_view_teaser'] = node_view($node, TRUE, $page = FALSE, FALSE);
     //checking whether taxonomy exists (for taxonomy markers)
     if ($node->taxonomy) {
       $markers['mainterm'] = current($node->taxonomy);
@@ -461,7 +462,9 @@ if (count($markers) > 0) {
     foreach ($markers as $mnode ) {
     //common properties for node markers 
     
-    $balcontent = "<h1>" . l($mnode['title'],"node/{$mnode['nid']}") . "</h1><br />" . $mnode['teaser'];
+//    $balcontent = "<h1>" . l($mnode['title'],"node/{$mnode['nid']}") . "</h1><br />" . $mnode['teaser'];
+      $balcontent = $mnode['node_view_teaser'];
+	
     $marks .= "
       balcontent['{$mnode['nid']}'] = " .drupal_to_js($balcontent). ";
     ";
@@ -618,6 +621,8 @@ function ymaps_get_node_tracks ($node) {
         $track['nid'] = $node->vid;
         $track['teaser'] = $node->teaser;
         $track['title'] = $node->title;
+    $track['node_view_teaser'] = node_view($node, TRUE, $page = FALSE, FALSE);
+		
         $tracks[] = $track;
 
       }
@@ -655,7 +660,8 @@ function ymaps_tracks_show ($mapid, $tra
     foreach ($tracks as $tracknum => $track ) {
     $points = _ymaps_track_to_polyline ($track);
     if (!$balloon[$track['nid']]) {
-      $balcontent = "<h1>" . l($track['title'],"node/{$track['nid']}") . "</h1><br />" . $track['teaser'];
+//      $balcontent = "<h1>" . l($track['title'],"node/{$track['nid']}") . "</h1><br />" . $track['teaser'];
+      $balcontent = $track['node_view_teaser'];
       $out .= "
       balcontent[{$track['nid']}] = " .drupal_to_js($balcontent). ";
       ";