diff --git a/code/GenericDataAdmin.php b/code/GenericDataAdmin.php
index 68317e80..3dc61958 100755
--- a/code/GenericDataAdmin.php
+++ b/code/GenericDataAdmin.php
@@ -412,9 +412,11 @@ HTML;
 				$result = $tmpItem;
 			}
 
-			// casting
-			list ($field, $caster) = explode("->", $field);
-			if($caster) {
+			if(strpos('->', $field) !== false) {
+				list ($field, $caster) = explode("->", $field);
+			}
+			
+			if(!empty($caster)) {
 				$fieldNameParts = explode('.', $field);
 				$fieldName = $fieldNameParts[sizeof($fieldNameParts)-1];
 				// When the intending value is Created.Date, the obj need to be casted as Datetime explicitely.
diff --git a/templates/Includes/MemberTableField.ss b/templates/Includes/MemberTableField.ss
index a1dae44e..4264e064 100755
--- a/templates/Includes/MemberTableField.ss
+++ b/templates/Includes/MemberTableField.ss
@@ -41,17 +41,17 @@
 						<td>$Value</td>
 						<% end_control %>
 						<% if Can(show) %>
-						<td width="18">
+						<td width="18" class="action">
 							<a class="popuplink showlink" href="$ShowLink" title="<% _t('SHOWMEMBER','Show this member') %>" target="_blank"><img src="cms/images/show.png" alt="show" /></a>
 						</td>
 						<% end_if %>
 						<% if Can(edit) %>
-						<td width="18">
+						<td width="18" class="action">
 							<a class="popuplink editlink" href="$EditLink" title="<% _t('EDITMEMBER','Edit this member') %>" target="_blank"><img src="cms/images/edit.gif" alt="edit" /></a>
 						</td>
 						<% end_if %>
 						<% if Can(delete) %>
-						<td width="18">
+						<td width="18" class="action">
 							<a class="deletelink" href="$DeleteLink" title="<% _t('DELETEMEMBER','Delete this member') %>"><img src="cms/images/delete.gif" alt="delete" /></a>
 						</td>
 						<% end_if %>