Fix to enable auto-suggestion feature