ref #4188 - fix subscription management bugs