Merge branch 'hotfix/search_page_arg'
iteration fixed
Merge branch 'hotfix/search_iterationfix' into develop