Moved some subscription value handling into widget