re-enable Dbxrefs (WITH/FROM) and add qualifiers