Minor improvements to EvidenceSourceSetController