Add to-do for non-subtype multiple fields