Fixing up search interface to allow for saving data instead of passing it through all the time.