Fix Search Handler Synchronization