diff --git a/ext/search/ang/search.module.js b/ext/search/ang/search.module.js
index f80d290b98c5..3b2eeb34ffe1 100644
--- a/ext/search/ang/search.module.js
+++ b/ext/search/ang/search.module.js
@@ -69,7 +69,7 @@
           }
           result.field = getField(fieldName);
           var split = fieldName.split(':'),
-            prefixPos = split[0].indexOf(result.field.name);
+            prefixPos = split[0].lastIndexOf(result.field.name);
           result.path = split[0];
           result.prefix = prefixPos > 0 ? result.path.substring(0, prefixPos) : '';
           result.suffix = !split[1] ? '' : ':' + split[1];
diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 3ec65608b000..1695f95701d8 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -166,7 +166,12 @@
           ctrl.stale = true;
           ctrl.debug = error.debug;
           $scope.error = errorMsg(error);
-        });
+        })
+          .finally(function() {
+            if (ctrl.debug) {
+              ctrl.debug.params = JSON.stringify(ctrl.params, null, 2);
+            }
+          });
       }
 
       var _loadResults = _.debounce(_loadResultsCallback, 250);
diff --git a/ext/search/ang/search/crmSearch/debug.html b/ext/search/ang/search/crmSearch/debug.html
index e7e4bd255e6c..4bb483d1af9e 100644
--- a/ext/search/ang/search/crmSearch/debug.html
+++ b/ext/search/ang/search/crmSearch/debug.html
@@ -2,6 +2,9 @@
   <legend class="collapsible-title">{{:: ts('Query Info') }}</legend>
   <div>
     <pre ng-if="$ctrl.debug.timeIndex">{{ ts('Request took %1 seconds.', {1: $ctrl.debug.timeIndex}) }}</pre>
+    <div><strong>API:</strong></div>
+    <pre>{{ $ctrl.debug.params }}</pre>
+    <div><strong>SQL:</strong></div>
     <pre ng-repeat="query in $ctrl.debug.sql">{{ query }}</pre>
   </div>
 </fieldset>