more fixes for federated search going OOM