Fix autocomplete and typeahead options extending