Keyword search concurrency refactoring