Make sure we index the repository_id information properly