more modifications to the generic search class