Fixing some problems with autocompleting empty string