improved search workflow