federated-search fix