Fix custom limit and offset