Change map type in executeSelectQuery - fix right header order for this method.