make search default ALL possibilities
Merge branch 'hotfix/3.6.7' into production