Query change as per table change.