diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index fb5e7e8c4b..1c40459432 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -742,6 +742,14 @@ class etemplate_widget_nextmatch extends etemplate_widget
 			}
 		}
 		$params[0] = $old_param0;
+
+		// Prevent troublesome keys from breaking the nextmatch
+		// TODO: Figure out where these come from
+		foreach(array('$row','${row}', '$', '0','1','2') as $key)
+		{
+			if(is_array(self::$request->content[$cname])) unset(self::$request->content[$cname][$key]);
+			if(is_array(self::$request->preserve[$cname])) unset(self::$request->preserve[$cname][$key]);
+		}
 	}
 }
 
diff --git a/etemplate/inc/class.etemplate_widget_transformer.inc.php b/etemplate/inc/class.etemplate_widget_transformer.inc.php
index b1c784c20a..ce1e0081f4 100644
--- a/etemplate/inc/class.etemplate_widget_transformer.inc.php
+++ b/etemplate/inc/class.etemplate_widget_transformer.inc.php
@@ -104,7 +104,7 @@ abstract class etemplate_widget_transformer extends etemplate_widget
 			error_log(__METHOD__."() $this has no id!");
 			return;
 		}
-		$attrs['value'] = $value =& self::get_array(self::$request->content, $form_name);
+		$attrs['value'] = $value =& self::get_array(self::$request->content, $form_name, false, true);
 		$attrs['type'] = $this->type;
 		$attrs['id'] = $this->id;