Agree Jörg we should definitely improve this, in general this area is all very v1 and needs some more iteration on it, there's lots to do though so can't promise immediate timelines but agree this is one we should and hopefully will iterate on soon-ish!