[cleanup] Remove all leftover occurences of deprecated map()

Timo Kochrequested to merge
cleanup/map-to-index into master

Replace by the index/subIndex method

Merge request reports