search reset bug fix
Merge branch 'Unho' into dev