Improve native query result mapping #620