Fix: pagination did not work
Merge branch 'dev-pagination' into develop