Small changes to map template