Fix for autosuggest issue