Fix limiting and pagination