mostly fixes in search class