Merging hdl's Search.pm changes