merge of latest master and using .map for autocomplete