Posted on the problem some time ago:
@loucadufault is right, you don’t have to rewrite your setup — simply add a column that would calculate end date by adding duration to start date. BTW don’t use CountIf() as it’s not optimized, as the docs say.
CountIf()