Prepare mapped embedded objects in queries (#611)