Enhanced subscription/subscriber handling in EP