Fixing issue with pagination and using a reserved word in the demo data model