diff --git a/server/AyaNova/biz/PickListFetcher.cs b/server/AyaNova/biz/PickListFetcher.cs
index 60a93014..ea31b0cb 100644
--- a/server/AyaNova/biz/PickListFetcher.cs
+++ b/server/AyaNova/biz/PickListFetcher.cs
@@ -10,7 +10,7 @@ namespace AyaNova.Biz
     internal static class PickListFetcher
     {
 
-        internal static PickListResult GetPickList(AyContext ct, long userId, PagingOptions pagingOptions, string tableName)
+        internal static PickListResult GetPickList(AyContext ct, long userId, PagingOptions pagingOptions, FilterOptions filterOptions, string tableName)
         {
 
             List<NameIdItem> listItems = new List<NameIdItem>();
@@ -39,7 +39,8 @@ namespace AyaNova.Biz
                     var TheFilter = ct.DataFilter.FirstOrDefault(x => x.Id == pagingOptions.DataFilterId);
 
                     //BUILD WHERE AND APPEND IT
-                    qCriteria = FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, WidgetBiz.FilterOptions(), userId);
+                    //qCriteria = FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, WidgetBiz.FilterOptions(), userId);
+                    qCriteria = FilterSqlCriteriaBuilder.DataFilterToSQLCriteria(TheFilter, filterOptions, userId);
 
                     //BUILD ORDER BY AND APPEND IT
                     qSort = FilterSqlOrderByBuilder.DataFilterToSQLOrderBy(TheFilter);
diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs
index d22eeb52..a0355372 100644
--- a/server/AyaNova/biz/UserBiz.cs
+++ b/server/AyaNova/biz/UserBiz.cs
@@ -240,7 +240,7 @@ namespace AyaNova.Biz
             pagingOptions.Limit = pagingOptions.Limit ?? PagingOptions.DefaultLimit;
 
 
-            var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, "auser");
+            var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, FilterOptions(), "auser");
 
             var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, ret.TotalRecordCount).PagingLinksObject();
 
diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index 7f3844a0..c4b1480b 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -324,7 +324,7 @@ namespace AyaNova.Biz
         {
             pagingOptions.Offset = pagingOptions.Offset ?? PagingOptions.DefaultOffset;
             pagingOptions.Limit = pagingOptions.Limit ?? PagingOptions.DefaultLimit;
-            var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, "awidget");
+            var ret = PickListFetcher.GetPickList(ct, UserId, pagingOptions, FilterOptions(), "awidget");
             var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, ret.TotalRecordCount).PagingLinksObject();
             ApiPagedResponse<NameIdItem> pr = new ApiPagedResponse<NameIdItem>(ret.Items, pageLinks);
             return pr;