fixes in subscription controller