INDEX all fixes