Pin mapentity to before perms
Fix missing land layer url, and small rewrite