Fixed ES creation of ids