Fix ETSI NSD requirement handling