Fix: use correct analyzed/non-analyzed field name for nested types