Fixed issue in autocomplete