Performing #236 : cherry-picking e33451d... Performing #236 : buggy attempt 2 : paginator ko, filtering ok
Fixes #236