Set "Use input data in the same workflow" to true by default
- Plus some bug fixes