Revising autocompleter for SF implementation