Add kind to permit organization params
Fix public organization locales