More search code and an interface for scanning a catalogue