more id fixes added