Added Alberto Benati's search code.