Feature/grammar v2 fixes

`SchedulerService` now actually uses the grammar-v2 parameters.