adding the tag updates to the wrap function as well
removing subject[@source] requirement ( to be fixed later) and fixing export spec to allow the aspace_ note prefixes