Fix some places which doesn't repsect org full name setting

Fix some places which doesn't repsect org full name setting #22964