GV: quick search fixes
Merge branch 'hotfix/1.1.8'