Bugs in Index Fixed