[CHS] Tweaks to the autocomplete
--amend
One more thing on the close button