Fixed the fixed search class