Fix some minor error
Fix issue in map key.[Map must have UNIQUE ID :)]