diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 271227d50..c7d3624a8 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -766,8 +766,14 @@ sub www_editField {
 	$tab = WebGUI::SQL->buildHashRef("select DataForm_tabId,label from DataForm_tab where assetId=".quote($self->getId));
 	$tab->{0} = WebGUI::International::get("no tab","Asset_DataForm");
         $f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
-        $f->hidden("fid",$session{form}{fid});
-        $f->hidden("func","editFieldSave");
+        $f->hidden(
+		-name => "fid",
+		-value => $session{form}{fid}
+	);
+        $f->hidden(
+		-name => "func",
+		-value => "editFieldSave"
+	);
 	$f->text(
                 -name=>"label",
                 -label=>WebGUI::International::get(77,"Asset_DataForm"),
@@ -917,8 +923,14 @@ sub www_editTab {
         	%tab = WebGUI::SQL->quickHash("select * from DataForm_tab where DataForm_tabId=".quote($session{form}{tid}));
 	}
         $f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
-        $f->hidden("tid",$session{form}{tid});
-        $f->hidden("func","editTabSave");
+        $f->hidden(
+		-name => "tid",
+		-value => $session{form}{tid}
+	);
+        $f->hidden(
+		-name => "func",
+		-value => "editTabSave"
+	);
 	$f->text(
                 -name=>"label",
 		-label=>WebGUI::International::get(101,"Asset_DataForm"),
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 91ba36c4d..cf000f95c 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -193,7 +193,10 @@ sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm;
 
-	$tabform->getTab('properties')->hidden("Survey_id",($self->get("Survey_id") || WebGUI::Id::generate()));
+	$tabform->getTab('properties')->hidden(
+		-name => "Survey_id",
+		-value => ($self->get("Survey_id") || WebGUI::Id::generate())
+	);
 	$tabform->getTab('display')->template(
 		-name		=> 'templateId',
 		-label		=> WebGUI::International::get('view template', 'Asset_Survey'),
@@ -806,10 +809,22 @@ sub www_editAnswer {
         
 	$answer = $self->getCollateral("Survey_answer","Survey_answerId",$session{form}{aid});
         $f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
-        $f->hidden("wid",$session{form}{wid});
-        $f->hidden("func","editAnswerSave");
-        $f->hidden("qid",$session{form}{qid});
-        $f->hidden("aid",$answer->{Survey_answerId});
+        $f->hidden(
+		-name => "wid",
+		-value => $session{form}{wid}
+	);
+        $f->hidden(
+		-name => "func",
+		-value => "editAnswerSave"
+	);
+        $f->hidden(
+		-name => "qid",
+		-value => $session{form}{qid}
+	);
+        $f->hidden(
+		-name => "aid",
+		-value => $answer->{Survey_answerId}
+	);
         $f->text(
                 -name=>"answer",
                 -value=>$answer->{answer},
@@ -824,7 +839,10 @@ sub www_editAnswer {
                 	-hoverHelp=>WebGUI::International::get('20 description','Asset_Survey')
                 	);
 	} else {
-		$f->hidden("isCorrect",0);
+		$f->hidden(
+			-name => "isCorrect",
+			-value => 0
+		);
 	}
 	if ($self->get("questionOrder") eq "response") {
 		$question = WebGUI::SQL->buildHashRef("select Survey_questionId,question 
@@ -894,11 +912,22 @@ sub www_editQuestion {
 	$answerFieldType = $question->{answerFieldType} || "radioList";
 	
 	$f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
-	$f->hidden("wid",$self->get("wobjectId"));
-	$f->hidden("func","editQuestionSave");
-	$f->hidden("qid",$question->{Survey_questionId});
-	$f->hidden("answerFieldType",$answerFieldType);
-	
+	$f->hidden(
+		-name => "wid",
+		-value => $self->get("wobjectId")
+	);
+	$f->hidden(
+		-name => "func",
+		-value => "editQuestionSave"
+	);
+	$f->hidden(
+		-name => "qid",
+		-value => $question->{Survey_questionId}
+	);
+	$f->hidden(
+		-name => "answerFieldType",
+		-value => $answerFieldType
+	);
 	$f->HTMLArea(
 		-name	=> "question",
 		-value	=> $question->{question},
@@ -1050,9 +1079,18 @@ sub www_editSection {
 	}
 	
 	$f = WebGUI::HTMLForm->new(-action=>$self->getUrl);
-	$f->hidden("wid",$self->get("wobjectId"));
-	$f->hidden("func","editSectionSave");
-	$f->hidden("sid",$section->{Survey_sectionId});
+	$f->hidden(
+		-name => "wid",
+		-value => $self->get("wobjectId")
+	);
+	$f->hidden(
+		-name => "func",
+		-value => "editSectionSave"
+	);
+	$f->hidden(
+		-name => "sid",
+		-value => $section->{Survey_sectionId}
+	);
 
 	$f->text(
 		-name	=> "sectionName",