Remove loop - pagination still not working correctly