Fix order update

* Modify order of date range
* Add conditional for custom provider