Fixes
Fix comment fetch order