Use shorter form for cloned subscriber
fix #4434: crash when storing filtered list
Merge branch 'issue-4434' into upstream