fixes in subscription forms