fix calculate-with-conditions deprecation warning
fix filter-with-before-and-after deprecation warning