UniquenessEnforcerNode and TrimmerNode improvements