WIP - Fixing pagination