Re #159: Fix some Trove federated search issues.