add permission checking in draft mode
fix issues with permission checking in draft mode