<Gaurav> fixing issues caused because of table splitting