improve contractacio form behaviour 8