MAL-35 | Add field group and fix date fields