diff --git a/server/AyaNova/Controllers/TagGroupController.cs b/server/AyaNova/Controllers/TagGroupController.cs
index efabdf4b..f2755648 100644
--- a/server/AyaNova/Controllers/TagGroupController.cs
+++ b/server/AyaNova/Controllers/TagGroupController.cs
@@ -134,7 +134,7 @@ namespace AyaNova.Api.Controllers
         /// </summary>
         /// <param name="id">TagGroupId</param>           
         /// <returns>name value list of all tags in group</returns>  
-        [HttpGet("TagsInGroupPickList")]
+        [HttpGet("TagsInGroupPickList/{id}")]
         public async Task<IActionResult> TagsInGroupPickList([FromRoute] long id)
         {
             if (!serverState.IsOpen)
diff --git a/server/AyaNova/biz/TagGroupBiz.cs b/server/AyaNova/biz/TagGroupBiz.cs
index 9cdee528..eb18e5e8 100644
--- a/server/AyaNova/biz/TagGroupBiz.cs
+++ b/server/AyaNova/biz/TagGroupBiz.cs
@@ -145,9 +145,12 @@ namespace AyaNova.Biz
         //get picklist (simple non-paged)       
         internal async Task<List<NameIdItem>> GetTagsInGroupPickListAsync(long tagGroupId)
         {
-            TODO: change this to return a name value list of tags in group
+            //first, get an array of the tagId's in this group
+            var tagGroupTags = await ct.TagGroupMap.Where(m => m.TagGroupId == tagGroupId).Select(m => m.TagId).ToArrayAsync();
+           
             List<NameIdItem> l = new List<NameIdItem>();
-            l = await ct.Locale
+            l = await ct.Tag
+            .Where(m => tagGroupTags.Contains(m.Id))
                    .OrderBy(m => m.Name)
                    .Select(m => new NameIdItem()
                    {
diff --git a/test/raven-integration/Tags/TagGroupOps.cs b/test/raven-integration/Tags/TagGroupOps.cs
index 24284a7d..e65c8532 100644
--- a/test/raven-integration/Tags/TagGroupOps.cs
+++ b/test/raven-integration/Tags/TagGroupOps.cs
@@ -63,7 +63,10 @@ namespace raven_integration
             Util.ValidateDataReturnResponseOk(R);
 
            
-            //GET PICKLIST OF TAGS FOR GROUP
+            //GET PICKLIST OF TAGS FOR GROUP            
+             R = await Util.GetAsync("TagGroup/TagsInGroupPickList/" + TestTagGroupId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            Util.ValidateDataReturnResponseOk(R);
+           // R.ObjectResponse["result"]["id"].Value<long>().Should().Be(tagMapId);
 
             //TAG ITEM WITH GROUP OF TAGS
 
@@ -72,57 +75,57 @@ namespace raven_integration
 
 
 
-            //CREATE WIDGET
-            dynamic w = new JObject();
-            w.name = Util.Uniquify("WIDGET_TAG");
-            w.created = DateTime.Now.ToString();
-            w.dollarAmount = 1.11m;
-            w.active = true;
-            w.roles = 0;
+            // //CREATE WIDGET
+            // dynamic w = new JObject();
+            // w.name = Util.Uniquify("WIDGET_TAG");
+            // w.created = DateTime.Now.ToString();
+            // w.dollarAmount = 1.11m;
+            // w.active = true;
+            // w.roles = 0;
 
-            R = await Util.PostAsync("Widget", await Util.GetTokenAsync("BizAdminFull"), w.ToString());
-            Util.ValidateDataReturnResponseOk(R);
-            long widgetId = R.ObjectResponse["result"]["id"].Value<long>();
+            // R = await Util.PostAsync("Widget", await Util.GetTokenAsync("BizAdminFull"), w.ToString());
+            // Util.ValidateDataReturnResponseOk(R);
+            // long widgetId = R.ObjectResponse["result"]["id"].Value<long>();
 
-            //CREATE TAGMAP (tag the widget)
-            /*
-            {
-            "tagId": 0,
-            "tagToObjectId": 0,
-            "tagToObjectType": 0
-            }
-             */
-            dynamic tm = new JObject();
-            tm.tagId = TestTagId;
-            tm.tagToObjectId = widgetId;
-            tm.tagToObjectType = 2;//widget
+            // //CREATE TAGMAP (tag the widget)
+            // /*
+            // {
+            // "tagId": 0,
+            // "tagToObjectId": 0,
+            // "tagToObjectType": 0
+            // }
+            //  */
+            // dynamic tm = new JObject();
+            // tm.tagId = TestTagId;
+            // tm.tagToObjectId = widgetId;
+            // tm.tagToObjectType = 2;//widget
 
 
-            R = await Util.PostAsync("TagMap", await Util.GetTokenAsync("BizAdminFull"), tm.ToString());
-            Util.ValidateDataReturnResponseOk(R);
-            long tagMapId = R.ObjectResponse["result"]["id"].Value<long>();
+            // R = await Util.PostAsync("TagMap", await Util.GetTokenAsync("BizAdminFull"), tm.ToString());
+            // Util.ValidateDataReturnResponseOk(R);
+            // long tagMapId = R.ObjectResponse["result"]["id"].Value<long>();
 
-            //VERIFY TAGMAP
-            R = await Util.GetAsync("TagMap/" + tagMapId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
-            Util.ValidateDataReturnResponseOk(R);
-            R.ObjectResponse["result"]["id"].Value<long>().Should().Be(tagMapId);
+            // //VERIFY TAGMAP
+            // R = await Util.GetAsync("TagMap/" + tagMapId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            // Util.ValidateDataReturnResponseOk(R);
+            // R.ObjectResponse["result"]["id"].Value<long>().Should().Be(tagMapId);
 
 
-            //ATTEMPT TO DELETE TAG THAT HAS TAGMAP SHOULD FAIL with 2200 / 400
-            R = await Util.DeleteAsync("Tag/" + TestTagId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
-            Util.ValidateViolatesReferentialIntegrityError(R);
+            // //ATTEMPT TO DELETE TAG THAT HAS TAGMAP SHOULD FAIL with 2200 / 400
+            // R = await Util.DeleteAsync("Tag/" + TestTagId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            // Util.ValidateViolatesReferentialIntegrityError(R);
 
-            //DELETE TAGMAP
-            R = await Util.DeleteAsync("TagMap/" + tagMapId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
-            Util.ValidateHTTPStatusCode(R, 204);
+            // //DELETE TAGMAP
+            // R = await Util.DeleteAsync("TagMap/" + tagMapId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            // Util.ValidateHTTPStatusCode(R, 204);
 
-            //DELETE TAG
-            R = await Util.DeleteAsync("Tag/" + TestTagId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
-            Util.ValidateHTTPStatusCode(R, 204);
+            // //DELETE TAG
+            // R = await Util.DeleteAsync("Tag/" + TestTagId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            // Util.ValidateHTTPStatusCode(R, 204);
 
-            //DELETE WIDGET
-            R = await Util.DeleteAsync("Widget/" + widgetId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
-            Util.ValidateHTTPStatusCode(R, 204);
+            // //DELETE WIDGET
+            // R = await Util.DeleteAsync("Widget/" + widgetId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            // Util.ValidateHTTPStatusCode(R, 204);
         }