GIA-3166 - Add ids to comment template