LP#1708291: tweak to subscription selector