diff --git a/hashtags.module b/hashtags.module
index 3f55ef4..af2e218 100644
--- a/hashtags.module
+++ b/hashtags.module
@@ -50,16 +50,16 @@ function hashtags_menu() {
  * Implementation of hook_form_alter().
  */
 function hashtags_form_alter(&$form, $form_state, $form_id) {
-  $vid = variable_get('hashtags_vocabulary', '');    
-  // check only for hashtag content types.  
-  if (isset($form['type']) && isset($form['#node']) && 
+  $vid = variable_get('hashtags_vocabulary', '');
+  // check only for hashtag content types.
+  if (isset($form['type']) && isset($form['#node']) &&
       _hashtags_node_check_node_type($form['#node']) &&
       !variable_get('hashtags_show_taxonomy_field', 1)) {
     $voc = taxonomy_vocabulary_load($vid);
-    $hashtags_field_id = "edit-field-".$voc->machine_name;    
+    $hashtags_field_id = "edit-field-".$voc->machine_name;
     // Hide hashtag textfield from node add/edit page;
     drupal_add_js('(function($){$("div#'.$hashtags_field_id.'").css("display", "none");})(jQuery);', array('type' => 'inline', 'scope' => 'footer'));
-  }    
+  }
 }
 
 /**
@@ -67,17 +67,17 @@ function hashtags_form_alter(&$form, $form_state, $form_id) {
  */
 function hashtags_node_presave($node) {
   $vid = variable_get('hashtags_vocabulary', '');
-  $voc = taxonomy_vocabulary_load($vid);  
+  $voc = taxonomy_vocabulary_load($vid);
   $hashtags = hashtags_get_tags($node->body['und'][0]['value']);
   $field_string = "field_$voc->machine_name";
 
   // we have 3 types of hashtags in Body field:
   // New,
   // Removed,
-  // Updated - not touched  
+  // Updated - not touched
   // Field contains tags and hashtags - we should synhronize Body and Field hashtags
   $all_hashtags_in_body     = array();
-  $new_hashtags_in_body      = array();  
+  $new_hashtags_in_body      = array();
   $removed_hashtags_in_body  = array();
   $steady_hashtags_in_body  = array();
   $all_hashtags_names_in_field = array();
@@ -106,17 +106,17 @@ function hashtags_node_presave($node) {
   //watchdog('new:', '<pre>'.print_r($new_hashtags_in_body, TRUE).'</pre>');
   //watchdog('upd:', '<pre>'.print_r($steady_hashtags_in_body, TRUE).'</pre>');
   //watchdog('del:', '<pre>'.print_r($removed_hashtags_in_body, TRUE).'</pre>');
-  
+
   $tags_on_remove = array();
   $i=0;
   // clear all hashtags from Tags list
   if (isset($node->{$field_string}['und']) && sizeof($node->{$field_string}['und'])) {
-    foreach($node->{$field_string}['und'] as $tag) { 
+    foreach($node->{$field_string}['und'] as $tag) {
       if ($tag['name'][0] == '#') {
         $tags_on_remove[] = $i;
       }
       ++$i;
-    }  
+    }
     foreach ($tags_on_remove as $tag_index) {
       unset ($node->{$field_string}['und'][$tag_index]);
     }
@@ -146,32 +146,32 @@ function hashtags_node_presave($node) {
     } else {
       $tid = $steady_hashtags_in_body[$name];
     }
-    
+
     $instance = array();
     $instance['tid'] = $tt[$tid]->tid;
     $instance['vid'] = $tt[$tid]->vid;
     $instance['name'] = $tt[$tid]->name;
     $instance['vocabulary_machine_name'] = $tt[$tid]->vocabulary_machine_name;
     $instance['rdf_mapping'] = $tt[$tid]->rdf_mapping;
-    $node->{$field_string}['und'][] = $instance;       
+    $node->{$field_string}['und'][] = $instance;
   }
 
-  
+
 }
 /**
  * Implementation of hook_node_load().
  */
-function hashtags_node_load($nodes) {  
+function hashtags_node_load($nodes) {
   $vid = variable_get('hashtags_vocabulary', 0);
-  $is_new = variable_get('hashtags_new_voc', 0);  
+  $is_new = variable_get('hashtags_new_voc', 0);
   foreach ($nodes as $node) {
     if (_hashtags_node_check_node_type($node)) {
-      $terms = hashtags_node_get_terms($node->nid);      
-      if (isset($node->teaser)) {        
+      $terms = hashtags_node_get_terms($node->nid);
+      if (isset($node->teaser)) {
         $node->teaser['und'][0]['safe_value'] = hashtags_node_transform_to_links($node->teaser['und'][0]['safe_value'], $terms);
-      } else {                
+      } else {
         $node->body['und'][0]['safe_value'] = hashtags_node_transform_to_links($node->body['und'][0]['safe_value'], $terms);
-      }           
+      }
     }
   }
 }
@@ -182,7 +182,7 @@ function hashtags_node_load($nodes) {
 function hashtags_get_tags($text) {
   $tags_list = array();
   $pattern = "/#[0-9A-Za-z_]+/";
-  preg_match_all($pattern, $text, $tags_list);    
+  preg_match_all($pattern, $text, $tags_list);
   $result = array_unique($tags_list[0]);
   return $result;
 }
@@ -209,35 +209,31 @@ function hashtags_node_get_terms($nid) {
     }
   }
 
-  return $terms;  
+  return $terms;
 }
 
 /*
  * Find each hashtag word (#some_word) and turn it into the link
  * (<a href="taxonomy/term/$tid">#some_word</a>). $tid are taken
- * from $terms array. 
+ * from $terms array.
  */
-function hashtags_node_transform_to_links($text, $terms) {       
+function hashtags_node_transform_to_links($text, $terms) {
   foreach ($terms as $word => $tid) {
-    if (strstr($text, $word)) {      
-      //$link = '<a href="#">'.$word.'</a>';// l($word, "taxonomy/term/$tid", array('attributes' => array('class' => 'hashtag')));
-      $link = l($word, "taxonomy/term/$tid"); // , array('attributes' => array('class' => 'hashtag'))      
-      // TODO:
-      // Fatal error: [] operator not supported for strings in E:\xampp\htdocs\...\common.inc on line 2313
-      // $link = l($word, "taxonomy/term/$tid", array('attributes' => array('class' => 'hashtag'));      
-      $pattern = "/$word\b/";      
-      $text = preg_replace($pattern, $link, $text);      
+    if (strstr($text, $word)) {
+      $link = l(t($word), 'taxonomy/term/' . $tid, array('attributes' => array('class' => array('hashtag'))));
+      $pattern = "/$word\b/";
+      $text = preg_replace($pattern, $link, $text);
     }
-  }  
+  }
   return $text;
 }
 
 /**
- * Check whether a content type can be used in a hashtag. 
+ * Check whether a content type can be used in a hashtag.
  */
 function _hashtags_node_check_node_type($node) {
   // Fetch information about the forum field.
-  $field = field_info_instance('node', 'field_hashtags', $node->type);  
+  $field = field_info_instance('node', 'field_hashtags', $node->type);
   return is_array($field);
 }