WP-3329 Adding in the field group for date fields