new fixes to index