search result label 404 error fix
Merge remote-tracking branch 'origin/search_result_pg333' into build-24