fixing the search form bug
fixing the search
Merge branch 'new-comp' into build-28