Enhanced work on 'federated-searches' plugin.