See if this fixes broken pagination