fixed search class