Fix on General Settings and refactor of documentAction
Fix on General Settings