Subscription extended details fix

Fixing issue #2941 and other issues with extend subscription details
<!---@tfsbridge:{"tfsId":2322260}-->