feat: improve the condition for checking default field on adding fields