Fix field templates for core and ds fields again