issue #658 , problem with search pagination
Merge branch 'hotfixes' into develop