Eng 5228 Fix table and index stats schema