#448 Make projection conversions more robust for native queries