US origin_ui_13 - Autocomplete RHC and handle wrapping more cleanly