Index: branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx
===================================================================
--- branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx	(revision 6141)
+++ branches/WebApplication/MVC2/HLWebOKBQueryPlugin/Views/Filter/Filters.ascx	(revision 6163)
@@ -33,18 +33,94 @@
     <%
            
-// If type is StringComparisonFilter build thes controls
+
 if ("StringComparisonFilter".Equals(f.GetType().Name))
 {  %>
-    <%: Html.TextBox(f.Id + ".valueTextbox", ((StringComparisonFilter)f).Value)%>
-    <%: Html.Label(f.GetType().Name)%>
+    <% StringComparisonFilter filter = ((StringComparisonFilter)f); %>
+
+    <%: Html.Label(filter.Label)%>
+    <%: Html.Label("=") %>
+    <%: Html.TextBox(f.Id + ".valueTextbox", (filter.Value))%>
+    <%: Html.ActionLink("-","DeleteFilter",  f.Id )%>
     <% }
-// If type is NameStringComparisonFilter build thes controls
 else if ("NameStringComparisonFilter".Equals(f.GetType().Name))
 { %>
-    <%: Html.TextBox(f.Id + ".valueTextbox" + f.Id, new{((NameStringComparisonFilter)f).Value})%>
-    <%: Html.Label(f.GetType().Name)%>
+    <% NameStringComparisonFilter filter = ((NameStringComparisonFilter)f); %>
+    <%: Html.Label(filter.Label)%>
+    <%: Html.Label("= xxx" + f.Id)%>
+    <%: Html.TextBox(f.Id + ".valueTextbox" + f.Id,  filter.Value )%>
+    <%: Html.ActionLink("-", "DeleteFilter", new { f.Id })%>
     <% }
+else if ("StringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
+{ %>
+    <% StringComparisonAvailableValuesFilter filter = ((StringComparisonAvailableValuesFilter)f); %>
+    <%: Html.Label(filter.Label)%>
+    <%: Html.Label("=")%> 
+    <%: Html.DropDownList(f.Id + ".valueDropDownList", new SelectList(filter.AvailableValues,filter.Value))%>
+    <%: Html.ActionLink("-","DeleteFilter",  f.Id )%>
+<% }
+else if ("NameEqualityComparisonByteArrayFilter".Equals(f.GetType().Name))
+{ %>
+    <% NameEqualityComparisonByteArrayFilter filter = ((NameEqualityComparisonByteArrayFilter)f); %>
+    <%: Html.Label(filter.Label)%>   
+    <%: Html.ActionLink("-","DeleteFilter",  f.Id )%>
+<% }  
+else if ("NameEqualityComparisonBoolFilter".Equals(f.GetType().Name))
+{ %>
+    <% NameEqualityComparisonBoolFilter filter = ((NameEqualityComparisonBoolFilter)f);
+    %>
+    <%: Html.Label(filter.Label)%>
+    <%: Html.Label("is")%> 
+    <%: Html.DropDownList(f.Id + ".valueDropDownList", new SelectList(((FilterModel)Model).GetBoolStates(),filter.Value)) %>
+    <%: Html.ActionLink("-","DeleteFilter",  f.Id )%>
+<% }
+else if ("NameOrdinalComparisonIntFilter".Equals(f.GetType().Name))
+{ %>
+    <% NameOrdinalComparisonIntFilter filter = ((NameOrdinalComparisonIntFilter)f);   %>
+    <%: Html.Label(filter.Label)%>
+    <%: Html.Label("is")%>    
 
-
+    <%: Html.ActionLink("-","DeleteFilter",  f.Id )%>
+<% }
+else if ("NameStringComparisonAvailableValuesFilter".Equals(f.GetType().Name))
+{ %>
+    <% NameStringComparisonAvailableValuesFilter filter = ((NameStringComparisonAvailableValuesFilter)f);   %>
+    <%: Html.Label(filter.Label)%>
+    <%: Html.Label("=")%> 
+    <%: Html.DropDownList(f.Id + ".valueDropDownList", new SelectList(filter.AvailableValues,filter.Value))%>   
+    <%: Html.ActionLink("-","DeleteFilter",  f.Id )%> 
+<% }
+else if ("NameOrdinalComparisonDoubleFilter".Equals(f.GetType().Name))
+{ %>
+    <% NameOrdinalComparisonDoubleFilter filter = ((NameOrdinalComparisonDoubleFilter)f);   %>
+    <%: Html.Label(filter.Label)%>
+    <%: Html.Label("=")%> 
+    <%: Html.TextBox(f.Id + ".valueTextbox" + f.Id,  filter.Value )%>   
+    <%: Html.ActionLink("-","DeleteFilter",  f.Id )%>
+<% }
+else if ("NameOrdinalComparisonFloatFilter".Equals(f.GetType().Name))
+{ %>
+    <% NameOrdinalComparisonFloatFilter filter = ((NameOrdinalComparisonFloatFilter)f);   %>
+    <%: Html.Label(filter.Label)%>
+    <%: Html.Label("=")%> 
+    <%: Html.TextBox(f.Id + ".valueTextbox" + f.Id,  filter.Value )%>   
+    <%: Html.ActionLink("-","DeleteFilter",  f.Id )%>
+<% }  
+    else if ("NameOrdinalComparisonFloatFilter".Equals(f.GetType().Name))
+{ %>
+    <% NameOrdinalComparisonLongFilter filter = ((NameOrdinalComparisonLongFilter)f);   %>
+    <%: Html.Label(filter.Label)%>
+    <%: Html.Label("=")%> 
+    <%: Html.TextBox(f.Id + ".valueTextbox" + f.Id,  filter.Value )%> 
+    <%: Html.ActionLink("-","DeleteFilter",  f.Id )%>  
+<% }                 
+                  
+       
+    
+    
+     
+    
+    
+    
+    
 else
 { %>
