improve custom fields sync