Sync selection and map better, fourth commit ;)