Fixed a problem with field autocompletion part 2