diff --git a/DataList/DataListReturnFormat.cs b/DataList/DataListReturnFormat.cs
index 35ea821..fbea850 100644
--- a/DataList/DataListReturnFormat.cs
+++ b/DataList/DataListReturnFormat.cs
@@ -34,10 +34,10 @@ namespace raven_integration
         }
 
         /// <summary>
-        /// Return un - filtered/sorted fields test
+        /// Return un - filtered/sorted fields and custom fields test
         /// </summary>       
         [Fact]
-        public async void DataListShouldReturnAllFieldsSpecifiedEvenIfUnsortedOrFiltered()
+        public async void DataListShouldReturnAllFieldsSpecifiedEvenIfUnsortedOrFilteredAndCustomToo()
         {
 
             dynamic dListView = new JArray();
diff --git a/DataList/DataListSorting.cs b/DataList/DataListSorting.cs
index 0cd26f8..91b7e47 100644
--- a/DataList/DataListSorting.cs
+++ b/DataList/DataListSorting.cs
@@ -60,8 +60,8 @@ namespace raven_integration
 
 
             //name starts with filter to constrict to widgets that this test block created only
-          
-  dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
+
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //NOW FETCH WIDGET LIST WITH FILTER
             // a = await Util.GetAsync($"DataList/list?DataListKey=TestWidgetDataList&Offset=0&Limit=999&DataFilterId={DataFilterId.ToString()}", await Util.GetTokenAsync("manager", "l3tm3in"));
@@ -143,8 +143,7 @@ namespace raven_integration
             //FILTER IN BY NAME FOR TESTING THIS RUN ONLY
             dynamic dListView = new JArray();
             //name starts with filter to constrict to widgets that this test block created only
-       
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
+
 
             //SORT ORDER ###################
             // dynamic dsortarray = new JArray();
@@ -152,7 +151,10 @@ namespace raven_integration
             // dsort.fld = "widgetstartdate";
             // dsort.dir = "+";
             // dsortarray.Add(dsort);
-            dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetname", "+"));
+
+            //both conditions filter and sort here
+            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart, "+"));
+
 
 
             //NOW FETCH WIDGET LIST WITH FILTER
@@ -233,9 +235,9 @@ namespace raven_integration
             //FILTER IN BY NAME FOR TESTING THIS RUN ONLY
             dynamic dListView = new JArray();
             //name starts with filter to constrict to widgets that this test block created only
-       
+
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
-           
+
 
             //SORT ORDER ###################
             // dynamic dsortarray = new JArray();
@@ -359,21 +361,21 @@ namespace raven_integration
             dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart));
 
             //SORT ORDER ###################
-          //  dynamic dsortarray = new JArray();
+            //  dynamic dsortarray = new JArray();
 
             //First column            
             // dynamic dsort1 = new JObject();
             // dsort1.fld = "widgetdollaramount";
             // dsort1.dir = "+";
             // dsortarray.Add(dsort1);
-             dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetdollaramount", "+"));
+            dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetdollaramount", "+"));
 
             //Second column            
             // dynamic dsort2 = new JObject();
             // dsort2.fld = "widgetcount";
             // dsort2.dir = "-";
             // dsortarray.Add(dsort2);
-             dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetcount", "-"));
+            dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetcount", "-"));
 
 
             //NOW FETCH WIDGET LIST WITH FILTER