Improved field_field_type_pre_save trigger