Added more options to SuggestionField introduced in f19de43