re#26 Fixing issues appeared after implementing categories persistence