fix map + forms