improve contractacio form behaviour 5