subscription.xml fixes