Misc. map fixes to organisation pages