diff --git a/jedi/evaluate/filters.py b/jedi/evaluate/filters.py
index 2b53876d..e60254b2 100644
--- a/jedi/evaluate/filters.py
+++ b/jedi/evaluate/filters.py
@@ -519,5 +519,5 @@ def get_global_filters(evaluator, context, until_position, origin_scope):
         context = context.parent_context
 
     # Add builtins to the global scope.
-    for filter in evaluator.builtins_module.get_filters(search_global=True):
+    for filter in evaluator.builtins_module.get_filters():
         yield filter
diff --git a/jedi/plugins/typeshed.py b/jedi/plugins/typeshed.py
index 0d1358c9..8a8dd2a0 100644
--- a/jedi/plugins/typeshed.py
+++ b/jedi/plugins/typeshed.py
@@ -256,8 +256,8 @@ class StubParserTreeFilter(ParserTreeFilter):
         result_names = []
         for key_name, names in self._used_names.items():
             found_names = self._convert_names(self._filter(names))
-            result_names += found_names
             if found_names:
+                result_names += found_names
                 used_stub_names.add(key_name)
 
         for non_stub_filter in self._non_stub_filters:
diff --git a/test/completion/classes.py b/test/completion/classes.py
index c139c4d2..d850d0cd 100644
--- a/test/completion/classes.py
+++ b/test/completion/classes.py
@@ -57,6 +57,8 @@ class TestClass(object):
         # should not know any class functions!
         #? []
         values
+        #?
+        values
         #? ['return']
         ret
         return a1