changes in indexes, few fields

as per meeting on march 6, 2013