[TASK] ADWD-1326 enhance pagination