fix the seaarch bar so that is can be used in any page.
Merge branch 'fixSearchBar' into dev