Update comment
Fix bug with race id key