fix and add edaSearchWrapper class