CAL-871 Possibility of Concurrency problem when using Unified search