Fix NGW resource description and key represent