REDBOX-207 #Comment Adding table indexes where necessary.