Issues with new serviceID format about huxley2 HOT 1 CLOSED

--- a/Huxley2/Connected Services/OpenLDBWS/BaseServiceItem.cs
+++ b/Huxley2/Connected Services/OpenLDBWS/BaseServiceItem.cs
@@ -11,9 +11,9 @@ namespace OpenLDBWS
 {
     public partial class BaseServiceItem
     {
         public string ServiceIdPercentEncoded => WebUtility.UrlEncode(serviceIDField);

-        public Guid ServiceIdGuid => new Guid(Convert.FromBase64String(serviceIDField));
+        // public Guid ServiceIdGuid => new Guid(serviceIDField);

         [SuppressMessage("Design", "CA1056:Uri properties should not be strings", Justification = "Not a URL")]
-        public string ServiceIdUrlSafe => WebEncoders.Base64UrlEncode(Convert.FromBase64String(serviceIDField));
+        public string ServiceIdUrlSafe => serviceIDField; // underscores are URL safe
     }
 }

--- a/Huxley2/Services/ServiceDetailsService.cs
+++ b/Huxley2/Services/ServiceDetailsService.cs
@@ -55,17 +55,27 @@ namespace Huxley2.Services

             // If ID looks like a RID (15 decimal digit long base 10 integer) then use the staff API if configured
             // This appears to be the date and the UID (with the first character in decimal representation)
-            if (request.ServiceId.Length == 15 && long.TryParse(request.ServiceId, out _)
-                && _accessTokenService.TryMakeStaffAccessToken(out var staffToken))
-            {
-                _logger.LogInformation($"Calling staff service details SOAP endpoint for {request.ServiceId}");
-                var staffService = await _staffSoapClient.GetServiceDetailsByRIDAsync(
-                    new GetServiceDetailsByRIDRequest
+            if (request.ServiceId.Length == 15) {
+                if (long.TryParse(request.ServiceId, out _)
+                    && _accessTokenService.TryMakeStaffAccessToken(out var staffToken)) {
+                    _logger.LogInformation($"Calling staff service details SOAP endpoint for {request.ServiceId}");
+                    var staffService = await _staffSoapClient.GetServiceDetailsByRIDAsync(
+                        new GetServiceDetailsByRIDRequest
+                        {
+                            AccessToken = staffToken,
+                            rid = request.ServiceId,
+                        });
+                    return staffService.GetServiceDetailsResult;
+                } else if (request.ServiceId.EndsWith("_")) {
+                    _logger.LogInformation($"Calling service details SOAP endpoint for {request.ServiceId}");
+                    var s = await _soapClient.GetServiceDetailsAsync(new GetServiceDetailsRequest
                     {
-                        AccessToken = staffToken,
-                        rid = request.ServiceId,
+                        AccessToken = _accessTokenService.MakeAccessToken(request),
+                        serviceID = request.ServiceId,
                     });
-                return staffService.GetServiceDetailsResult;
+                    return s.GetServiceDetailsResult;
+
+                }
             }