Typeahead should not overflow
Merge branch 'michel_2593_typeahead' into next