Correcting issues with pagination in store