QAART-179 next fixes after kkarolk CR
QAART-179 changing pagination method