Fixed issue with autocompletes messing up