Fix for issue where subscription info is lost, and making code more restrictive to the specific template