generate data and pagination fixes