fix handling of instance data tags