Add type=comment feature