MAL-30 | Add field group and fix date fields

phpcs /dir1 /dir2