Fixing id underscores in objects data