simplify persistent subscription a bit