Bug correction with pagination system as reported in issues