fix on pagination
Merge branch 'dev' into feature/front_improvements