Fixed to use hive.query.id for JobId (in Tez/Hive)