Table fixes to index