foundry mapper fix for nested queries
2 files changed