Make fields optional in note text as suggested in ml