CLDIDE-1952: rework add subscription

@skabashnyuk @mshaposhnik @evoevodin @sleshchenko 
Please, review my changes