diff --git a/src/js/asset-viewer.js b/src/js/asset-viewer.js
index ecdef01c2..54fef4599 100644
--- a/src/js/asset-viewer.js
+++ b/src/js/asset-viewer.js
@@ -66,7 +66,7 @@
     if ( hints instanceof Object ) {
         const mode = cmEditor.getMode();
         if ( mode.setHints instanceof Function ) {
-            mode.setHints(hints);
+            mode.setHints(hints, true);
         }
     }
 
diff --git a/src/js/messaging.js b/src/js/messaging.js
index 478f2c215..c8c175165 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -1202,7 +1202,7 @@ const onMessage = function(request, sender, callback) {
 
     case 'getAutoCompleteDetails':
         response = {};
-        if ( request.hintUpdateToken === 0 ) {
+        if ( (request.hintUpdateToken || 0) === 0 ) {
             response.redirectResources = µb.redirectEngine.getResourceDetails();
             response.preparseDirectiveTokens = µb.preparseDirectives.getTokens();
             response.preparseDirectiveHints = µb.preparseDirectives.getHints();