[TASK] ADWD-1326 enhance pagination
Merge pull request #182 from snaegle/ADWD-1326

[TASK] ADWD-1326 enhance pagination