GV: quick search fixes
Merge branch 'hotfix/1.1.8'
Merge tag '1.1.8' into develop

1.1.8