Added search function in better location to all needed lcoations