fixes #7674 preserve prefix during merge
Update search query url,fixes #6047
Merge branch 'dev' into test