Applied Index design & Bug fix