1) externalRefs can have a list of sub-externalRefs, 2) Merge naf-fbk into 'naf', 3) Fix bug in externalRefs