AutoComplete&Map selection, fixes