change controllSearch
Merge branch 'master' into work
Merge branch 'master' into work
fixed error