Make some index fixes was getting wrong info