TODO:
- review forms in relation with dates (term, additional term, min delay, max delay) to make them consistent