Fix a few comments
Refactor Calculcator\Jmp to use Filters instead of FilterSet #2704