Renamed search objects
Search now has all the options and is a separate object