(chore) Pagination working with refactored store and query spec subscriber