--- Form.pm.orig	2004-11-04 11:13:37.000000000 -0200
+++ Form.pm	2004-11-04 15:34:09.000000000 -0200
@@ -216,7 +216,7 @@
 # ============================
 =pod
 
----++ sub _link (  $web, $name, $tooltip, $heading, $align, $span, $extra  )
+---++ sub _link (  $web, $name, $tooltip, $heading, $align, $span, $extra, $topic  )
 
 Not yet documented.
 
@@ -224,7 +224,7 @@
 
 sub _link
 {
-    my( $web, $name, $tooltip, $heading, $align, $span, $extra ) = @_;
+    my( $web, $name, $tooltip, $heading, $align, $span, $extra, $topic ) = @_;
     
     $name =~ s/[\[\]]//go;
     
@@ -258,8 +258,13 @@
                  "onclick=\"return launchWindow('$web','$name')\" " .
                  "title=\"$tooltip\" " .
                  "href=\"$TWiki::scriptUrlPath/view$TWiki::scriptSuffix/$web/$name\">$name</a>";
-    } elsif ( $tooltip ) {
-        $link = "<span title=\"$tooltip\">$name</span>";
+    } else {
+        my $expandedName = &TWiki::handleCommonTags( $name, $topic );
+        if ( $tooltip ) {
+            $link = "<span title=\"$tooltip\">$expandedName</span>";
+        } else {
+            $link = "$expandedName";
+        }
     }
 
     my $html = "<$cell$attr$span$align>$link $extra</$cell>";
@@ -303,7 +308,7 @@
     
     # FIXME could do with some of this being in template
     my $text = "<div class=\"twikiForm twikiEditForm\"><table border=\"1\" cellspacing=\"0\" cellpadding=\"0\">\n   <tr>" . 
-               _link( $web, $form, "", "h", "", 2, $chooseForm ) . "</tr>\n";
+               _link( $web, $form, "", "h", "", 2, $chooseForm, $topic ) . "</tr>\n";
                
     fieldVars2Meta( $web, $query, $meta, "override" );
     
@@ -375,7 +380,8 @@
                 }
                 $defaultMarker = "";
                 $item =~ s/<nop/&lt\;nop/go;
-                $val .= "   <option$selected>$item</option>";
+                my $expandedItem = &TWiki::handleCommonTags( $item, $topic );
+                $val .= "   <option value=\"$item\" $selected>$expandedItem</option>";
             }
             if( ! $matched ) {
                $val =~ s/%DEFAULTOPTION%/ selected="selected"/go;
@@ -441,7 +447,7 @@
             $value =~ s/>/&gt\;/go;
             $value = "<input class=\"twikiEditFormError\" type=\"text\" name=\"$name\" size=\"80\" value=\"$value\" />";
         }
-        $text .= "   <tr> " . _link( $web, $title, $tooltip, "h", "right", "", $extra ) . "<td align=\"left\"> $value </td> </tr>\n";
+        $text .= "   <tr> " . _link( $web, $title, $tooltip, "h", "right", "", $extra, $topic ) . "<td align=\"left\"> $value </td> </tr>\n";
     }
     $text .= "</table></div>\n";