Fixes on generate_paginator