Incremental refresh - desktop vs. dataflow

I'm also seeing this issue when trying to set up incremental refresh in a dataflow from SAP HANA. In the "Added Items" step I was able to filter one of the calculation view variables with the generated RangeStart and RangeEnd parameters, converted to the appropriate format:

#"Added items" = Cube.Transform(CV_XXXXXX, {{Cube.ApplyParameter, "Xxxxxxxx", {0, "xxx"}}, {Cube.ApplyParameter, "Document_Date", {6, Number.ToText(ConvertToDocDateKey(RangeStart)), Number.ToText(ConvertToDocDateKey(RangeEnd))}},...

This is the right way to filter the calculation view to run efficiently on HANA (aka not process all the data and filter it at the end).

But as stated above the autogenerated line filter is added at the end. If I delete this step the preview in the dataflow is processed fine. If I click Save & Close everything is validated and I can start refreshing. But it fails because of some date format incompatibility that when I go in to check again is in the filter line added at the end again. 

It's a pity, I was so close to have this simplified.