Hacky shit to fix pagination weirdness - will come back to this