--- linodef-rc2-original/includes/linodef-filter.inc	2008-11-30 14:00:30.000000000 +0100
+++ linodef/includes/linodef-filter.inc	2009-01-21 14:16:53.000000000 +0100
@@ -45,6 +45,16 @@
     "@\[#([0-9]+):([0-9a-z_]+),([a-zA-Z,=]*) (.+?)\]@e"                => "_linodef_filter_processoptions($1,$2,0,'$3');",
     "@\[#([0-9]+):([0-9a-z_]+):([0-9]+),([a-zA-Z,=]*) (.+?)\]@e"       => "_linodef_filter_processoptions($1,$2,$3,'$4');",
 
+    // for compatibility reasons:
+    // Embed title or field values, add no link
+    "@\[#nl([0-9]+)\]@e"                                    => "_linodef_filter_processoptions($1,False,0,'nolink');",
+    "@\[#nl([0-9]+):([0-9a-z_]+)\]@e"                       => "_linodef_filter_processoptions($1,$2,0,'nolink');",
+    "@\[#nl([0-9]+):([0-9a-z_]+):([0-9]+)\]@e"              => "_linodef_filter_processoptions($1,$2,$3,'nolink');",
+
+    // Link Node ID and embed vocabulary term -> not senseful, termID does this better -> removed
+    // Link term ID and embed term name
+    "@\[#t([0-9]+)\]@e"                                     => "_linodef_find_term($1);",
+
   );
   $body = preg_replace(array_keys($preg), array_values($preg), $body);
 
@@ -205,14 +215,6 @@
 
         // Convert the tags of all the filters of default input filter.
         // Include a filter settings so admin can choose if he wants to use plain text with check_plain? Not needed IMHO (keep it simple).
-        $output = check_markup($output, '', False);
-        // Remove annoying <p> tag enclosing $output created by line break converter.
-        if (substr($output, 0, 3) == '<p>') {
-            $output = substr($output, 3);
-        }
-        if (substr($output, -5, 4) == '</p>') {
-            $output = substr($output, 0, -5);
-        }
 
         if (isset($options['no_link'])) {
             return $output;