Code cleanup

Switched from ["id"] to ["id_str"]