improve contractacio form behaviour 7