Map layers fix