I opened a FR to improve this. Please check if that solution would help with the problem you explain.