FEATURE - fix index style