Improve questions call - add nested answers