-Hopefully last autocomplete fixes