issue #57458080 Further autocomplete improvements