New patch and repairs for subscription views