diff --git a/src/main/kotlin/com/emberjs/hbs/HbsLocalCompletion.kt b/src/main/kotlin/com/emberjs/hbs/HbsLocalCompletion.kt
index 997fddb8..12a3c62c 100644
--- a/src/main/kotlin/com/emberjs/hbs/HbsLocalCompletion.kt
+++ b/src/main/kotlin/com/emberjs/hbs/HbsLocalCompletion.kt
@@ -44,6 +44,7 @@ import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.elementType
 import com.intellij.psi.util.isAncestor
 import com.intellij.psi.xml.XmlAttribute
+import com.intellij.psi.xml.XmlTag
 import com.intellij.refactoring.suggested.startOffset
 import com.intellij.util.ProcessingContext
 import java.util.function.Predicate
@@ -434,6 +435,9 @@ class HbsLocalCompletion : CompletionProvider<CompletionParameters>() {
                 }
                 return
             }
+            if (element.parent is XmlTag) {
+                return
+            }
         }
 
         val result: MutableList<LookupElement> = mutableListOf()
diff --git a/src/main/kotlin/com/emberjs/utils/EmberUtils.kt b/src/main/kotlin/com/emberjs/utils/EmberUtils.kt
index ad9d3136..127309c3 100644
--- a/src/main/kotlin/com/emberjs/utils/EmberUtils.kt
+++ b/src/main/kotlin/com/emberjs/utils/EmberUtils.kt
@@ -413,6 +413,10 @@ class EmberUtils {
                 return followReferences(elem)
             }
 
+            if (element is TypeScriptTypeofType) {
+                return followReferences(element.expression?.reference?.resolve())
+            }
+
             if (element is ES6ImportSpecifier) {
                 val results = element.multiResolve(false)
                 val internal = (element.parent.parent as ES6ImportDeclarationImpl).fromClause?.references?.find { it is EmberInternalJSModuleReference } as? EmberInternalJSModuleReference