Update for Client Report extension: Fix bug comment tokens