@loostro The same fix is easy to accomplish in the `edit` builder, that is quite a good idea. 
I would exclude the `new` and `edit` builder as you can already define custom FormTypes (as you mentioned). I believe it is the better option for editing the `edit` and `new` types (better reusable in custom forms anywhere else)