[#1159] Remove the 'id' from extra_vars