Subfix

Fixing issue #2941 and other issues with extend subscription details