FIX nested mapping and nested query