Fixed autocomplete and underline