subscriptions: fixed 2 bugs