fix searching problems