Here is another solution by adding paging.
patch created at Coworks