diff --git a/PaloAlto/Client/PaloAltoClient.cs b/PaloAlto/Client/PaloAltoClient.cs
index 79beb0a..81bd464 100644
--- a/PaloAlto/Client/PaloAltoClient.cs
+++ b/PaloAlto/Client/PaloAltoClient.cs
@@ -176,9 +176,7 @@ public async Task<GetProfileByCertificateResponse> GetProfileByCertificate(strin
         {
             try
             {
-                var xPath = storePath.Contains("template",StringComparison.CurrentCultureIgnoreCase)
-                    ? $"{storePath}/ssl-tls-service-profile/entry[@name='{certificate}']"
-                    : $"{storePath}/ssl-tls-service-profile/entry[./certificate='{certificate}']";
+                var xPath = $"{storePath}/ssl-tls-service-profile/entry[./certificate='{certificate}']";
                 var uri = $"/api/?type=config&action=get&target-tpl={GetTemplateName(storePath)}&xpath={xPath}&key={ApiKey}";
                 var response =
                     await GetXmlResponseAsync<GetProfileByCertificateResponse>(await HttpClient.GetAsync(uri));
diff --git a/PaloAlto/Jobs/Inventory.cs b/PaloAlto/Jobs/Inventory.cs
index 0e6e4ee..54be2f2 100644
--- a/PaloAlto/Jobs/Inventory.cs
+++ b/PaloAlto/Jobs/Inventory.cs
@@ -203,7 +203,7 @@ protected virtual CurrentInventoryItem BuildInventoryItem(string alias, string c
                 //Add Entry Params so the show up in the UI Inventory Store Popup
                 var siteSettingsDict = new Dictionary<string, object>
                 {
-                    { "ProfileName", string.IsNullOrEmpty(bindings.Result?.Entry?.Name)?"":bindings.Result?.Entry?.Name},
+                    { "TlsProfileName", string.IsNullOrEmpty(bindings.Result?.Entry?.Name)?"":bindings.Result?.Entry?.Name},
                     { "TlsMinVersion", string.IsNullOrEmpty(bindings.Result?.Entry?.ProtocolSettings?.MinVersion?.Text)?"":bindings.Result?.Entry?.ProtocolSettings?.MinVersion?.Text},
                     { "TlsMaxVersion", string.IsNullOrEmpty(bindings.Result?.Entry?.ProtocolSettings?.MaxVersion?.Text)?"":bindings.Result?.Entry?.ProtocolSettings?.MaxVersion?.Text },
                     { "Trusted Root", trustedRoot},