fixes to index on group