Tweak autocomplete

fixes #2026