diff --git a/css/Form.css b/css/Form.css
index 547a560b9..33da7900d 100644
--- a/css/Form.css
+++ b/css/Form.css
@@ -78,17 +78,17 @@ form button.minorAction {
 /**
  * Composite Fields - raw concatenation of fields for programmatic purposes.
  */
-.right form div.field.CompositeField {
+.right form div.CompositeField {
 	margin-left: 7.5em;
 }
-.right form div.field.CompositeField div.field {
+.right form div.CompositeField div.field {
 	font-size: 1em;
 }
 
-.right form div.field.CompositeField {
+.right form div.CompositeField {
 	clear: both;
 }	
-.right form div.field.CompositeField label.left {
+.right form div.CompositeField label.left {
 	float: left;
 	width: 10em;
 	margin-left: -10em;
@@ -161,4 +161,4 @@ form .message {
 }
 #ForgotPassword {
 	margin-top: 1em;
-}
\ No newline at end of file
+}
diff --git a/css/TableListField.css b/css/TableListField.css
index 1e6b7d5d3..fa7ba27d4 100644
--- a/css/TableListField.css
+++ b/css/TableListField.css
@@ -75,7 +75,7 @@ table.TableField tfoot td,
 table.CMSList tbody td,
 table.CMSList tfoot td {
 	border: 1px solid #f1efe2;
-	padding: 0 5px;
+	padding: 2px 4px;
 }
 
 .TableListField table.data tfoot tr.addtogrouprow td {
@@ -114,7 +114,7 @@ table.TableField tbody tr.over td,
 .TableListField table.data tbody tr.over td, 
 .TableListField table.data tbody tr.over td input,
 table.CMSList tbody td.over td{
-	background-color: #FFCC66;
+	background-color: #FFFFBB;
 }
 
 table.TableField tbody tr.current td, 
diff --git a/forms/TableListField.php b/forms/TableListField.php
index 9c21b0e4c..35be2ca7d 100755
--- a/forms/TableListField.php
+++ b/forms/TableListField.php
@@ -314,6 +314,12 @@ JS
 					$XML_sort = (isset($_REQUEST['ctf'][$this->Name()]['dir'])) ? Convert::raw2xml($_REQUEST['ctf'][$this->Name()]['dir']) : null;
 					$sortLink = HTTP::setGetVar("ctf[{$this->Name()}][dir]", $XML_sort, $sortLink);
 				}
+				if(isset($_REQUEST['ctf'][$this->Name()]['search'])) {
+					foreach($_REQUEST['ctf'][$this->Name()]['search'] as $parameter => $value) {
+						$XML_search = Convert::raw2xml($value);
+						$sortLink = HTTP::setGetVar("ctf[{$this->Name()}][search][$parameter]", $XML_search, $sortLink);
+					}
+				}
 			} else {
 				$sortLink = '#';
 			}
diff --git a/templates/TableField.ss b/templates/TableField.ss
index 446786b0f..9dd43debe 100755
--- a/templates/TableField.ss
+++ b/templates/TableField.ss
@@ -30,8 +30,8 @@
 		<% if Can(add) %>
 			<tr>
 				<td colspan="$ItemCount">
-					<a href="#" class="addrow" title="<% _t('ADD', 'Add a new row') %>"><img src="cms/images/add.gif" alt="<% _t('ADD') %>" />
-						<% sprintf(_t('ADDITEM'),$Title) %> 
+					<a href="#" class="addrow" title="<% _t('ADD', 'Add a new row') %>"><img src="cms/images/add.gif" alt="<% _t('ADD','Add a new row') %>" />
+						<% sprintf(_t('ADDITEM','Add %s'),$Title) %>
 					</a>
 				</td>
 				<td style="display: none"></td>