Changed Search map to a struct, added helper functions to set Search struct values