Thanks for the clear and helpful feedback @Arties
This will need testing and replicating then we'll look at improving this. 5.3.3 is almost finished ... so this is most likely in 5.3.4 which will be out not much longer than 5.3.3.
Improving this though is a great idea, thanks.
Really happy to hear that 
And we can keep on improving!