[WIP] [HOTFIX] Added possibility to save full categories