LPS-34436 Improve subscriptions consistency

Hey Brian,

This is the first commit. When this is merge, we will send it for some other portlets that are a little more complex.

Thanks!