re #722 - Added pagination