Account for Subparts when handling sections; Fix Supplement I link