fixing search use case