Fix xss vulunerability leak in subscriptions