improve contractacio form behaviour 1