Try to fix performance issue when listing subscribers