Improve heb choice and dates choices in base form and contact proprio (#5282)