diff --git a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
index d116cc06..bef85f42 100644
--- a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
+++ b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
@@ -111,7 +111,11 @@ namespace AyaNova.DataList
             {
                 switch (DataType)
                 {
+                    //ALL TEXT TYPES
                     case UiFieldDataType.Text:
+                    case UiFieldDataType.PhoneNumber:
+                    case UiFieldDataType.EmailAddress:
+                    case UiFieldDataType.HTTP:
                         {
                             if (sOperator == DataListFilterComparisonOperator.Equality)
                             {
@@ -179,7 +183,11 @@ namespace AyaNova.DataList
                 #region Build for specific type
                 switch (DataType)
                 {
+                    //ALL TEXT TYPES
                     case UiFieldDataType.Text:
+                    case UiFieldDataType.PhoneNumber:
+                    case UiFieldDataType.EmailAddress:
+                    case UiFieldDataType.HTTP:
                         //escape any pre-existing apostrophes
                         //i.e. "O'Flaherty's pub"
                         sValue = sValue.Replace("'", "''");