Started adding root search back.