[OnDemand] fix Search.