diff --git a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
index cbf4b075..ca19579e 100644
--- a/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
+++ b/server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
@@ -138,7 +138,7 @@ namespace AyaNova.Biz
                 #region Build for specific type
                 switch (sDataType)
                 {
-                    case "System.String":
+                    case "text":
                         //escape any pre-existing apostrophes
                         //i.e. "O'Flaherty's pub" would cause fits
                         //if this wasn't done
@@ -241,7 +241,7 @@ namespace AyaNova.Biz
 
                         }
                         break;
-                    case "System.Boolean":
+                    case "bool":
                         {
                             switch (sOperator)
                             {
@@ -268,32 +268,6 @@ namespace AyaNova.Biz
                         }
                         break;
 
-                    case "System.Guid":
-                        {
-                            switch (sOperator)
-                            {
-                                case "Equals":
-                                    sb.Append("= ");
-                                    sb.Append("'");
-                                    sb.Append(sValue);
-                                    sb.Append("'");
-                                    break;
-
-                                case "NotEquals":
-                                    sb.Append("<> ");
-                                    sb.Append("'");
-                                    sb.Append(sValue);
-                                    sb.Append("'");
-
-                                    break;
-                                default:
-                                    throw new System.ArgumentOutOfRangeException("OPERATOR_TYPE", sOperator, "GridToSqlCriteria unhandled operator type [" + sOperator + "] in BOOL");
-
-                            }
-                        }
-                        break;
-
-
                     case "date":
                         {
 
diff --git a/test/raven-integration/DataFilter/DataFilterFilteringLists.cs b/test/raven-integration/DataFilter/DataFilterFilteringLists.cs
index eee48900..dee2414f 100644
--- a/test/raven-integration/DataFilter/DataFilterFilteringLists.cs
+++ b/test/raven-integration/DataFilter/DataFilterFilteringLists.cs
@@ -49,6 +49,8 @@ namespace raven_integration
         //TEXT
         //
 
+        //TODO: Specifically test a string with an apostrophe in it
+
         ///////////////////////
         //INT
         //