WIP: subscription item various improvement

I must write some tests for those changes.

Meanwhile, I publish this MR to advertise the changes (and get some feedbacks) and run all existing tests.