CLDIDE-2163: rework subscription flow

@skabashnyuk @sleshchenko
Please, review my changes