MDL-69107 form_autocomplete: Rewrite item selection