diff --git a/Tags/TagOps.cs b/Tags/TagOps.cs
index 6156c2b..fb4378e 100644
--- a/Tags/TagOps.cs
+++ b/Tags/TagOps.cs
@@ -20,6 +20,7 @@ namespace raven_integration
             var TestName = "TagCRUDProcessingWorks";
             var WidgetRunNameStart = Util.Uniquify(TestName);
             var TagNameStart = Util.Uniquify("crud-tag-test-") + "-";//ensure this run gets it's own unique tags
+            TagNameStart=TagNameStart.Replace(" ","");
 
             List<string> InitialTagsList = new List<string>();
             InitialTagsList.Add(TagNameStart + "red");
@@ -64,7 +65,7 @@ namespace raven_integration
             uint ConcurrencyToken = a.ObjectResponse["data"]["concurrencyToken"].Value<uint>();
 
             //validate the repository LIST ROUTE of tags contains the ones above
-            a = await Util.GetAsync($"TagPickList/list/" + TagNameStart, await Util.GetTokenAsync("manager", "l3tm3in"));
+            a = await Util.GetAsync($"TagPickList/picklist?query={TagNameStart}", await Util.GetTokenAsync("manager", "l3tm3in"));
             Util.ValidateDataReturnResponseOk(a);
             Util.ValidateHTTPStatusCode(a, 200);
             ((JArray)a.ObjectResponse["data"]).Count.Should().Be(7);
@@ -86,7 +87,7 @@ namespace raven_integration
 
 
             //Verify the tags collection remaining            
-            a = await Util.GetAsync($"TagPickList/list/" + TagNameStart, await Util.GetTokenAsync("manager", "l3tm3in"));
+            a = await Util.GetAsync($"TagPickList/picklist?query=" + TagNameStart, await Util.GetTokenAsync("manager", "l3tm3in"));
             Util.ValidateDataReturnResponseOk(a);
             Util.ValidateHTTPStatusCode(a, 200);
             ((JArray)a.ObjectResponse["data"]).Count.Should().Be(9);
@@ -97,7 +98,7 @@ namespace raven_integration
             Util.ValidateHTTPStatusCode(DELETETestResponse, 204);
 
             //Verify the tags collection remaining            
-            a = await Util.GetAsync($"TagPickList/list/" + TagNameStart, await Util.GetTokenAsync("manager", "l3tm3in"));
+            a = await Util.GetAsync($"TagPickList/picklist?query=" + TagNameStart, await Util.GetTokenAsync("manager", "l3tm3in"));
             Util.ValidateDataReturnResponseOk(a);
             Util.ValidateHTTPStatusCode(a, 200);
             ((JArray)a.ObjectResponse["data"]).Count.Should().Be(0);