diff --git a/docs/upgrades/templates-6.99.0/inbox.tmpl b/docs/upgrades/templates-6.99.0/inbox.tmpl
index 4a9531049..e04de8573 100644
--- a/docs/upgrades/templates-6.99.0/inbox.tmpl
+++ b/docs/upgrades/templates-6.99.0/inbox.tmpl
@@ -18,7 +18,7 @@
       <tmpl_var dateStamp.label>
    </td>
 </tr>
-<tmpl_if message.noresults>
+<tmpl_if noresults>
    <tr>
        <td class="tableData">
           <tmpl_var noresults>
diff --git a/docs/upgrades/templates-6.99.0/inboxmessage.tmpl b/docs/upgrades/templates-6.99.0/inboxmessage.tmpl
index ddf98ec2b..cac0dafca 100644
--- a/docs/upgrades/templates-6.99.0/inboxmessage.tmpl
+++ b/docs/upgrades/templates-6.99.0/inboxmessage.tmpl
@@ -10,11 +10,8 @@
 <tmpl_var status><br /><br />
 <p> <tmpl_var message></p>
 
-<div class="accountOptions">
-        <ul>
-        <tmpl_loop accountOptions>
-                <li><tmpl_var options.display></li>
+<ul class="accountOptions">
+	<tmpl_loop accountOptions><li><tmpl_var options.display></li>
         </tmpl_loop>
-        </ul>
-</div>
+</ul>
 
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index 759bc25a0..5a7b92162 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -95,7 +95,7 @@ sub formatURL {
 	my $self = shift;
 	my $func = shift;
 	my $listingId = shift;
-	my $url = $self->getUrl("func=".$func."&listingId=".$listingId);
+	my $url = $self->getUrl("func=".$func.";listingId=".$listingId);
 	return $url;
 }
 
@@ -129,7 +129,7 @@ sub getCompareForm {
 			vertical=>1,
 			value=>\@ids,
 			options=>$self->session->db->buildHashRef("select listingId, concat('<a href=\\\"".
-				$self->getUrl("func=viewDetail")."&amp;listingId=',listingId,'\\\">', productName,'</a>') from Matrix_listing 
+				$self->getUrl("func=viewDetail").";listingId=',listingId,'\\\">', productName,'</a>') from Matrix_listing 
 				where assetId=".$self->session->db->quote($self->getId)." and status='approved' order by productName")
 			})
 		."<br />"
@@ -343,7 +343,7 @@ sub www_deleteListing {
 	my $self = shift;
 	my $i18n = WebGUI::International->new($self->session,'Asset_Matrix');
 	my $output = sprintf $i18n->get('delete listing confirmation'),
-		$self->getUrl("func=deleteListingConfirm&listingId=".$self->session->form->process("listingId")),
+		$self->getUrl("func=deleteListingConfirm;listingId=".$self->session->form->process("listingId")),
 		$self->formatURL("viewDetail",$self->session->form->process("listingId"));
 	return $self->processStyle($output);
 }
@@ -670,7 +670,7 @@ sub www_editListingSave {
 			groupId=>$self->get("groupIdEdit"),
 			userId=>$self->get("ownerUserId"),
 			subject=>"New Listing Added",
-			message=>"A new listing, ".$data{productName}.", is waiting to be added.\n\n".$self->session->url->getSiteURL()."/".$self->formatURL("viewDetail",$self->session->form->process("listingId"))
+			message=>"A new listing, ".$data{productName}.", is waiting to be added.\n\n".$self->session->url->getSiteURL()."/".$self->formatURL("viewDetail",$listingId)
 			});
 	}
 	my $a = $self->session->db->read("select fieldId, name, fieldType from Matrix_field");
@@ -682,7 +682,7 @@ sub www_editListingSave {
 			$value = $self->session->form->process($name,$type);
 		}
 		$self->session->db->write("replace into Matrix_listingData (assetId, listingId, fieldId, value) values (
-			".$self->session->db->quote($self->getId).", ".$self->session->db->quote($self->session->form->process("listingId")).", ".$self->session->db->quote($id).", ".$self->session->db->quote($value).")");
+			".$self->session->db->quote($self->getId).", ".$self->session->db->quote($listingId).", ".$self->session->db->quote($id).", ".$self->session->db->quote($value).")");
 	}
 	$a->finish;
         return $self->www_viewDetail($listingId);
@@ -779,10 +779,10 @@ sub www_listFields {
         return $self->session->privilege->insufficient() unless($self->canEdit);
 	my $i18n = WebGUI::International->new($self->session,'Asset_Matrix');
 	my $output = sprintf $i18n->get('list fields'),
-				$self->getUrl("func=editField&amp;fieldId=new");
+				$self->getUrl("func=editField;fieldId=new");
 	my $sth = $self->session->db->read("select fieldId, label from Matrix_field where assetId=".$self->session->db->quote($self->getId)." order by label");
 	while (my ($id, $label) = $sth->array) {
-		$output .= '<a href="'.$self->getUrl("func=editField&amp;fieldId=".$id).'">'.$label.'</a><br />';
+		$output .= '<a href="'.$self->getUrl("func=editField;fieldId=".$id).'">'.$label.'</a><br />';
 	}
 	$sth->finish;
 	return $self->processStyle($output);
@@ -1028,8 +1028,8 @@ sub www_viewDetail {
 	$var{id} = $listingId;
 	$var{'user.canEdit'} = ($self->session->user->userId eq $listing->{maintainerId} || $self->canEdit);
 	$var{'user.canApprove'} = $self->canEdit;
-	$var{'approve.url'} = $self->getUrl("func=approveListing&listingId=".$listingId."&mlog=".$self->session->form->process("mlog"));
-	$var{'delete.url'} = $self->getUrl("func=deleteListing&listingId=".$listingId."&mlog=".$self->session->form->process("mlog"));
+	$var{'approve.url'} = $self->getUrl("func=approveListing;listingId=".$listingId);
+	$var{'delete.url'} = $self->getUrl("func=deleteListing;listingId=".$listingId);
 	$var{'isPending'} = ($listing->{status} eq "pending");
 	$var{'lastUpdated.epoch'} = $listing->{lastupdated};
 	$var{'lastUpdated.date'} = $self->session->datetime->epochToHuman($listing->{lastUpdated},"%z");
@@ -1039,7 +1039,7 @@ sub www_viewDetail {
 	$var{'productUrl.click'} = $self->formatURL("click",$listingId);
 	$var{manufacturerName} = $listing->{manufacturerName};
 	$var{manufacturerUrl} = $listing->{manufacturerUrl};
-	$var{'manufacturerUrl.click'} = $self->getUrl("m=1&amp;func=click&amp;listingId=".$listingId);
+	$var{'manufacturerUrl.click'} = $self->getUrl("m=1;func=click;listingId=".$listingId);
 	$var{versionNumber} = $listing->{versionNumber};
 	my $f = WebGUI::HTMLForm->new($self->session,
 		-extras=>'class="content"',
diff --git a/lib/WebGUI/Inbox/Message.pm b/lib/WebGUI/Inbox/Message.pm
index 1a4aa3908..a3170c788 100644
--- a/lib/WebGUI/Inbox/Message.pm
+++ b/lib/WebGUI/Inbox/Message.pm
@@ -163,7 +163,8 @@ An epoch date representing when the action associated with this message was comp
 
 sub get {
 	my $self = shift;
-	return $self->{_properties}{shift};
+	my $name = shift;
+	return $self->{_properties}{$name};
 }
 
 
diff --git a/lib/WebGUI/Operation/Inbox.pm b/lib/WebGUI/Operation/Inbox.pm
index 9e275af57..23cd376f2 100644
--- a/lib/WebGUI/Operation/Inbox.pm
+++ b/lib/WebGUI/Operation/Inbox.pm
@@ -64,7 +64,7 @@ sub www_viewInbox {
    	$vars->{'dateStamp.label'} = $i18n->get(352);
   	my $messages = WebGUI::Inbox->new($session)->getMessagesForUser($session->user); 
    	foreach my $message (@$messages) {   
-      		my $hash;
+      		my $hash = {};
       		$hash->{'subject'} =  '<a href="'.$session->url->page('op=viewInboxMessage;messageId='.$message->getId).'">'.$message->get("subject").'</a>';
       		$hash->{status} = _status($session)->{$message->get("status")};
 	  	$hash->{'dateStamp'} =$session->datetime->epochToHuman($message->get("dateStamp"));
@@ -86,22 +86,22 @@ Templated display of a single message for the user.
 
 sub www_viewInboxMessage {
 	my $session = shift;
-	my ($data, $vars);
 	return $session->privilege->insufficient() unless ($session->user->isInGroup(2));
 	my $i18n = WebGUI::International->new($session);
+	my $vars = {};
    	$vars->{title} = $i18n->get(159);
 	my $message = WebGUI::Inbox->new($session)->getMessage($session->form->param("messageId"));
 	if (defined $message) {
-	   	$vars->{'subject'} = $data->{subject};
-	   	$vars->{'dateStamp'} =$session->datetime->epochToHuman($data->{dateStamp});
-   		$vars->{'status'} = _status($session)->{$data->{status}}; 
-   		unless ($data->{message} =~ /\<div/ig || $data->{message} =~ /\<br/ig || $data->{message} =~ /\<p/ig) {
-      			$data->{message} =~ s/\n/\<br\>/g;
+	   	$vars->{'subject'} = $message->get("subject");
+	   	$vars->{'dateStamp'} =$session->datetime->epochToHuman($message->get("dateStamp"));
+   		$vars->{'status'} = _status($session)->{$message->get("status")}; 
+		$vars->{message} = $message->get("message");
+   		unless ($vars->{message} =~ /\<div/ig || $vars->{message} =~ /\<br/ig || $vars->{message} =~ /\<p/ig) {
+      			$vars->{message} =~ s/\n/\<br\>/g;
    		}
-   		unless ($data->{message} =~ /\<a/ig) {
-      			$data->{message} =~ s/(http\S*)\s/\<a href=\"$1\"\>$1\<\/a\>/g;
+   		unless ($vars->{message} =~ /\<a/ig) {
+      			$vars->{message} =~ s/(http\S*)/\<a href=\"$1\"\>$1\<\/a\>/g;
    		}
-   		$vars->{'message'} = $data->{message};
 	}
    	$vars->{'accountOptions'} = WebGUI::Operation::Shared::accountOptions($session);
    	return $session->style->userStyle(WebGUI::Asset::Template->new($session,"PBtmpl0000000000000205")->process($vars));