better handling of USCF ID vs address