templater improvements, custom fields