Main pagination repaired