Map repository, more autojoin, modal message