This is not nice, we should use have within query but that would mean we need to create our own processor. That's why I hotfix within the existing one.
