more simplifications to autocompleter
tweaks
add map-chan and filter-chan