SFR-9 #resolve #comment Fixes most of the problems found in subsriptions

SFR-9 #resolve #comment Fixes most of the problems found in subsriptions