CLDIDE-1952: rework add subscription

@skabashnyuk @mshaposhnik @evoevodin @sleshchenko 
Please, review my changes
My formatter is older, but I think it is not about formatter, but about manual code formating