Change comment fetch logic