Konstantin observed really poor behaviour of the API when pretty basic filters are applied. This will be properly fixed with the new data model, but for now it can be largely mitigated. I will backport these to stable/2.1 so anyone sticking on 2.1 for the next little while can still benefit.