Fix comment ids and keys