Fixed manage subscription behavior
Merge pull request #63 from akrakovsky/bugfixing_manage_subscriptions

Fixed manage subscription behavior