More fixes to beat paging plugin