Feature 4 pagination toggle issue