form fixes + value mandatory fix