refactoring dataextractionfields and preparing new form to be able to edit as well