Fixes on generate_paginator class extension