Fixed search bug
Additional changes with hydrants