Fix autocomplete crash in prod