Fixed some errors
Fixed missing name and mbid