Updated pagination system for bug correction