small refactor permission and right order fields