Change child logic to use form questions directly