Fix for some paging issues with COS mashup