json structure, index fixes
generator