Fixes autocomplete functions