Fix searching. Need design documents.