Little improvement, map proposition is shown only once.