Fixed to autocomplete classes