Scan form improvements

* merged data proposition
* diff data
* some fixs and improvements