Search refractored