diff --git a/src/pages/Explore/Trending/Trending.vue b/src/pages/Explore/Trending/Trending.vue
index 28ff754..7076304 100644
--- a/src/pages/Explore/Trending/Trending.vue
+++ b/src/pages/Explore/Trending/Trending.vue
@@ -344,6 +344,9 @@
                     }
 
                     let data = []
+                    Object.entries(dataHolder).forEach(key=>{
+
+                    })
                     for(let key in dataHolder) {
                         data.push(dataHolder[key])
                     }
diff --git a/src/pages/Repository/Commits/components/CommitItem.vue b/src/pages/Repository/Commits/components/CommitItem.vue
index 49c7781..2251adb 100644
--- a/src/pages/Repository/Commits/components/CommitItem.vue
+++ b/src/pages/Repository/Commits/components/CommitItem.vue
@@ -43,8 +43,8 @@
     import {AnimatedHeightWrapper,ImgWrapper} from '@/components'
     import {CommitStatusIcon} from '../../components'
     import {CommitAuthorAvatar} from '@/pages/Repository/components'
-    import {mapState,mapActions} from 'vuex'
-    import * as actionTypes from '@/store/modules/graphqlListData/actionTypes'
+    import {mapActions} from 'vuex'
+    import * as actionTypes from '@/store/modules/graphqlData/actionTypes'
     export default {
         props: {
             commit: {
@@ -53,11 +53,6 @@
             }
         },
         computed: {
-            ...mapState({
-                commitGraphqlData(state){
-                    return state.graphqlListData.commits.filter(i => i.id == this.commit.node_id)[0]
-                } 
-            }),
             committedNotByAuthor() {
                 if(!this.commit.author) return
                 if(!this.commit.committer) return
@@ -68,11 +63,35 @@
             }
         },
         created() {
-            if(!this.commitGraphqlData) this.action_getCommitGraphqlData({id:this.commit.node_id})
+            if(!this.commitGraphqlData) this.action_getCommitGraphqlData({
+                id: this.commit.node_id,
+                graphql: `
+                    query($ids:[ID!]!){
+                        nodes(ids: $ids) {
+                        ... on Commit {
+                            id
+                            authors (first: 4) {
+                                nodes {
+                                    name
+                                    user {
+                                    avatarUrl
+                                    login
+                                    name
+                                    }
+                                }
+                            }
+                            status {
+                                state
+                            }
+                        }
+                        }
+                    }
+                    `
+            })
         },
         methods: {
            ...mapActions({
-               action_getCommitGraphqlData: actionTypes.GET_COMMITS 
+               action_getCommitGraphqlData: actionTypes.GET_NODES 
            })
         },
         components: {
diff --git a/src/pages/Repository/Commits/components/graphql.js b/src/pages/Repository/Commits/components/graphql.js
new file mode 100644
index 0000000..203c43f
--- /dev/null
+++ b/src/pages/Repository/Commits/components/graphql.js
@@ -0,0 +1,22 @@
+export const NODES_COMMIT = `
+query($ids:[ID!]!,$withAuthors:Boolean!,$withState:Boolean!){
+    nodes(ids: $ids) {
+      ... on Commit {
+        id
+        authors (first: 4) @include(if: $withAuthors) {
+          nodes {
+            name
+            user {
+              avatarUrl
+              login
+              name
+            }
+          }
+        }
+        status @include(if: $withState) {
+            state
+        }
+      }
+    }
+  }
+`
\ No newline at end of file
diff --git a/src/pages/Repository/Issues/IssueDetail/components/Reactions.vue b/src/pages/Repository/Issues/IssueDetail/components/Reactions.vue
index 47cd944..cfcac9d 100644
--- a/src/pages/Repository/Issues/IssueDetail/components/Reactions.vue
+++ b/src/pages/Repository/Issues/IssueDetail/components/Reactions.vue
@@ -1,14 +1,14 @@
 <template>
-    <div  v-if="viewerCanReact || (reactions.data && reactions.data.total_count > 0)" class="border-top">
+    <div v-if="viewerCanReact || (reactionsData && reactionsData.some(i => i.totalCount > 0))" class="border-top">
         <div class="reactions">
             <button class="reaction-item btn-link" 
                 :style="reactionItemStyle"
-                :class="{'user-has-reacted':reactionsViewerHasReacted.some(i => i == item.content)}" 
-                v-for="item in availableReaction.filter(i => reactions.data[i.content] || reactions.data[i.content] > 0)" 
+                :class="{'user-has-reacted':item.viewerHasReacted}" 
+                v-for="item in reactionsData.filter(i => i.totalCount > 0)" 
                 :key="item.content" 
-                :disabled="!viewerCanReact" @click="() => network_createReaction(item.content)">
+                :disabled="!viewerCanReact || loadingCreateReaction" @click="() => network_createReaction(item)">
                 {{item.label}}    
-                {{reactions.data[item.content] || reactions.data[item.content]}}  
+                {{item.totalCount}}  
             </button>
             <button v-if="viewerCanReact" :disabled="loadingCreateReaction" class="reaction-item muted-link d-inline-block position-relative" style="border-color:transparent;padding-right:4px;padding-left:4px" @click="() => showModal('pickReactionModal')">
                 <span style="color:transparent">👍1</span>    
@@ -24,11 +24,11 @@
 
         <Modal ref="pickReactionModal" title="Pick your reaction">
             <div class="d-flex flex-wrap mx-2 py-1">
-                <button :class="{'border-gray-dark bg-blue-light':reactionsViewerHasReacted.some(i => i == item.content)}" 
+                <button :class="{'border-gray-dark bg-blue-light':item.viewerHasReacted}" 
                         :disabled="loadingCreateReaction" 
                         :value="item.content" 
-                        v-for="item in availableReaction" 
-                        @click="() => network_createReaction(item.content)" 
+                        v-for="item in reactionsData" 
+                        @click="() => network_createReaction(item)" 
                         :key="item.label" 
                         class="btn-link col-3 d-flex flex-justify-center flex-items-center no-underline add-reactions-options-item">
                     {{item.label}}
@@ -43,7 +43,9 @@
     import {Modal,LoadingIcon} from '@/components'
     import * as api from '@/network/api'
     import {authRequiredGet,authRequiredPost,authRequiredDelete,authRequiredGitHubGraphqlApiQuery} from '@/network'
-    import * as graphql from './graphql.js'
+    import * as graphql from './TimelineItem/components/graphql'
+    import * as actionTypes from '@/store/modules/graphqlData/actionTypes'
+    import {mapState,mapActions} from 'vuex'
     export default {
         data() {
             return {
@@ -94,10 +96,6 @@
                 type: Object,
                 default: true
             },
-            viewerCanReact: {
-                type: Boolean,
-                default: false
-            },
             reactionsHostType: {
                 type: String,
                 default: 'issueComment'
@@ -108,54 +106,70 @@
             }
         },
         computed: {
+            nodeId() {
+                return this.reactionsHost.node_id
+            },
             repo() {
                 return this.$route.params.repo
             },
             owner() {
                 return this.$route.params.owner
             },
-        },
-        created() {
-            if(this.reactionsHost.reactions) {
-                this.reactions.data = this.reactionsHost.reactions
-            }else {
-                this.network_getReactions()
-            }
-            if(this.viewerCanReact) {
-                this.network_getViewHasReactedInfo()
+            viewerCanReact() {
+                if(this.graphqlData) return this.graphqlData.viewerCanReact
+            },
+            reactionsData() {
+                if(this.graphqlData) return [
+                    {
+                    label: "👍",
+                    content: "+1",
+                    ...this.graphqlData.THUMBS_UP
+                },
+                {
+                    label: "👎",
+                    content: "-1",
+                    ...this.graphqlData.THUMBS_DOWN
+                },
+                {
+                    label: "😄",
+                    content: "laugh",
+                    ...this.graphqlData.LAUGH
+                },
+                {
+                    label: "🎉",
+                    content: "hooray",
+                    ...this.graphqlData.HOORAY
+                },
+                {
+                    label: "😕",
+                    content: "confused",
+                    ...this.graphqlData.CONFUSED
+                },
+                {
+                    label: "❤️",
+                    content: "heart",
+                    ...this.graphqlData.HEART
+                },
+                {
+                    label: "🚀",
+                    content: "rocket",
+                    ...this.graphqlData.ROCKET
+                },
+                {
+                    label: "👀",
+                    content: "eyes",
+                    ...this.graphqlData.EYES
+                },
+                ]
             }
         },
         methods: {
-            async network_getReactions() {
-                try{
-                    this.reactions.loading = true
-                    let url = this.reactionsHost.url
-                    if(this.reactionsHostType == 'issue') {
-                        url = api.API_ISSUE({
-                            repo: this.repo,
-                            owner: this.owner,
-                            number: this.$route.params.number
-                        })
-                    }
-                    if(!url) return 
-                    let res = await authRequiredGet(
-                        url,
-                        {
-                            headers: {
-                                "Accept":"application/vnd.github.squirrel-girl-preview"
-                            }
-                        },
-                    )
-
-                    this.reactions.data = res.data.reactions
-                }catch(e) {
-                    console.log(e)
-                }finally{
-                    this.reactions.loading = false
-                }
-            },
-            async network_createReaction(content) {
+            ...mapActions({
+                action_GetIssueCommentGraphqlData: actionTypes.GET_NODES
+            }),
+            async network_createReaction({viewerHasReacted,content}) {
                 this.closeModal()
+                
                 try{
                     this.loadingCreateReaction = true
                     let url
@@ -204,14 +218,16 @@
                         }
                     )
 
-                    if(this.reactionsViewerHasReacted.some(i => i == content)) {
+                    if(viewerHasReacted) {
                         await this.network_deleteReaction(res.data)
-                        this.reactions.data[content] -= 1
                         return 
                     }
 
-                    this.reactions.data[content] += 1
-                    this.reactionsViewerHasReacted.push(content)
+                    await this.action_GetIssueCommentGraphqlData({
+                        id: this.reactionsHost.node_id,
+                        graphql: graphql.NODES_ISSUE_COMMENT,
+                        sync: true
+                    })
 
                 }catch(e) {
                     this.handleError(e)
@@ -220,7 +236,7 @@
                 }
             },
             async network_deleteReaction(reaction) {
-                 let url
+                let url
                 switch(this.reactionsHostType) {
                     case 'issueComment':
                         url = api.API_ISSUE_COMMENT_REACTION({
@@ -267,62 +283,12 @@
                     }
                 )
 
-                this.reactionsViewerHasReacted.forEach((i,index) => {
-                    if(i == reaction.content) this.reactionsViewerHasReacted.splice(index,1) 
+                await this.action_GetIssueCommentGraphqlData({
+                    id: this.reactionsHost.node_id,
+                    graphql: graphql.NODES_ISSUE_COMMENT,
+                    sync: true
                 })
             },
-            async network_getViewHasReactedInfo() {
-                if(!this.reactionsHost.node_id) return 
-                let nodeType
-                 switch(this.reactionsHostType) {
-                    case 'issue':
-                        nodeType = 'Issue'
-                        break;
-                    case 'reviewComment':
-                        nodeType = 'PullRequestReviewComment'
-                        break;
-                    case 'commitComment':
-                        nodeType = 'CommitComment'
-                        break;
-                    default:
-                        nodeType = 'IssueComment'
-                }
-                try {
-                    let res = await authRequiredGitHubGraphqlApiQuery(
-                        graphql.GRAPHQL_VIEWER_HAS_REACTED_INFO(nodeType),
-                        {
-                            variables: {
-                                id: this.reactionsHost.node_id
-                            }
-                        }
-                    )
-
-                    if(!res.data.data.node.id) return
-
-                    try {
-                        if(res.data.data.node.THUMBS_UP.viewerHasReacted) this.reactionsViewerHasReacted.push('+1')
-                        if(res.data.data.node.THUMBS_DOWN.viewerHasReacted) this.reactionsViewerHasReacted.push('-1')
-                        if(res.data.data.node.LAUGH.viewerHasReacted) this.reactionsViewerHasReacted.push('laugh')
-                        if(res.data.data.node.HOORAY.viewerHasReacted) this.reactionsViewerHasReacted.push('hooray')
-                        if(res.data.data.node.CONFUSED.viewerHasReacted) this.reactionsViewerHasReacted.push('confused')
-                        if(res.data.data.node.HEART.viewerHasReacted) this.reactionsViewerHasReacted.push('heart')
-                        if(res.data.data.node.ROCKET.viewerHasReacted) this.reactionsViewerHasReacted.push('rocket')
-                        if(res.data.data.node.EYES.viewerHasReacted) this.reactionsViewerHasReacted.push('eyes')
-                    } catch (e) {
-                        console.log(e)
-                    }
-                } catch (e) {
-                    console.log(e)
-                }
-
-            },
-        },
-        watch: {
-            viewerCanReact(newOne,oldOne) {
-                if(newOne && !oldOne) {
-                    this.network_getViewHasReactedInfo()
-                }
-            }
         },
         components: {
             Modal,
diff --git a/src/pages/Repository/Issues/IssueDetail/components/TimelineItem/components/Comment.vue b/src/pages/Repository/Issues/IssueDetail/components/TimelineItem/components/Comment.vue
index fafed2e..2ca8c7a 100644
--- a/src/pages/Repository/Issues/IssueDetail/components/TimelineItem/components/Comment.vue
+++ b/src/pages/Repository/Issues/IssueDetail/components/TimelineItem/components/Comment.vue
@@ -1,6 +1,6 @@
 <template>
     <Container class="position-relative timeline-item transition-all" style="padding-top:16px;padding-bottom:16px">
-        <Inner v-if="!commentExtraDataHolder.isMinimized" class="inner bg-white">
+        <Inner v-if="!graphqlData.isMinimized" class="inner bg-white">
             <Header class="px-3 header text-normal f5" :class="{'current-user':viewer.login == data.user.login}" :style="headerStyle">
                 <Action class="action py-2 px-1 ml-2 position-relative" style="align-self:start" @click="showActionPopover">
                     <svg aria-label="Show options" class="octicon octicon-kebab-horizontal v-align-text-bottom" viewBox="0 0 16 16" version="1.1" width="16" height="16" role="img"><path d="M8 9a1.5 1.5 0 100-3 1.5 1.5 0 000 3zM1.5 9a1.5 1.5 0 100-3 1.5 1.5 0 000 3zm13 0a1.5 1.5 0 100-3 1.5 1.5 0 000 3z"></path></svg>
@@ -16,14 +16,14 @@
                                 <button class="popover-item btn-link dropdown-item">
                                     Reference in new issue
                                 </button>
-                                <div class="dropdown-divider" v-if="commentExtraDataHolder.viewerCanUpdate || commentExtraDataHolder.viewerCanMinimize || commentExtraDataHolder.viewerCanDelete"></div> 
-                                <button v-if="commentExtraDataHolder.viewerCanUpdate"  @click.stop="() => triggerEdit(true)" class="popover-item btn-link dropdown-item">
+                                <div class="dropdown-divider" v-if="graphqlData.viewerCanUpdate || graphqlData.viewerCanMinimize || graphqlData.viewerCanDelete"></div> 
+                                <button v-if="graphqlData.viewerCanUpdate"  @click.stop="() => triggerEdit(true)" class="popover-item btn-link dropdown-item">
                                     Edit
                                 </button>
-                                <button v-if="graphqlWritePermission && commentExtraDataHolder.viewerCanMinimize" @click.stop="() => triggerMinimizePane(true)" class="popover-item btn-link dropdown-item">
+                                <button v-if="graphqlWritePermission && graphqlData.viewerCanMinimize" @click.stop="() => triggerMinimizePane(true)" class="popover-item btn-link dropdown-item">
                                     Hide
                                 </button>
-                                <button v-if="commentExtraDataHolder.viewerCanDelete" @click.stop="network_deleteThisComment" class="popover-item btn-link hover-red dropdown-item" style="color:#d73a49">
+                                <button v-if="graphqlData.viewerCanDelete" @click.stop="network_deleteThisComment" class="popover-item btn-link hover-red dropdown-item" style="color:#d73a49">
                                     Delete
                                 </button>
                                 <div class="dropdown-divider" v-if="viewerIsCollaborator().data"></div> 
@@ -71,7 +71,7 @@
                         </span>
                         <span class="no-wrap">{{(data.created_at || data.submitted_at) | getDateDiff}}</span>
 
-                        <span v-if="!accessToken || (commentExtraDataHolder.userContentEdits && commentExtraDataHolder.userContentEdits.totalCount > 0)" class="d-inline-block text-gray btn-link" @click="() => showModal('editHistoriesModal')">
+                        <span v-if="graphqlData.userContentEdits && graphqlData.userContentEdits.totalCount > 0" class="d-inline-block text-gray btn-link" @click="() => showModal('editHistoriesModal')">
                             <span class="d-inline-block text-gray-light">•</span> 
                             edited
                             <svg height="11" class="octicon octicon-triangle-down v-align-middle" viewBox="0 0 12 16" version="1.1" width="8" aria-hidden="true"><path fill-rule="evenodd" d="M0 5l6 6 6-6H0z"></path></svg>
@@ -118,7 +118,7 @@
                     <LoadingIconEx/>
                 </LoadingWrapper> -->
 
-                <Reactions :reactionsHost="data" :viewerCanReact="commentExtraDataHolder.viewerCanReact" :reactionsHostType="commentType"></Reactions>
+                <Reactions :reactionsHost="data" :viewerCanReact="graphqlData.viewerCanReact" :reactionsHostType="commentType"></Reactions>
 
             </div>
         </Inner>
@@ -132,7 +132,7 @@
                 </button>
 
                 <h3 class="header-minimized-title f5 text-gray text-normal text-italic">
-                    This comment was marked as {{commentExtraDataHolder.minimizedReason}}
+                    This comment was marked as {{graphqlData.minimizedReason}}
                 </h3>
 
                 <Action v-if="showMinimized && !editing" class="px-1 position-absolute minimized-comment-action" @click="showActionPopover">
@@ -149,14 +149,14 @@
                                     <button class="popover-item btn-link dropdown-item">
                                         Reference in new issue
                                     </button>
-                                    <div class="dropdown-divider" v-if="commentExtraDataHolder.viewerCanUpdate || commentExtraDataHolder.viewerCanMinimize || commentExtraDataHolder.viewerCanDelete"></div> 
-                                    <button v-if="commentExtraDataHolder.viewerCanUpdate" @click.stop="() => triggerEdit(true)" class="popover-item btn-link dropdown-item">
+                                    <div class="dropdown-divider" v-if="graphqlData.viewerCanUpdate || graphqlData.viewerCanMinimize || graphqlData.viewerCanDelete"></div> 
+                                    <button v-if="graphqlData.viewerCanUpdate" @click.stop="() => triggerEdit(true)" class="popover-item btn-link dropdown-item">
                                         Edit
                                     </button>
-                                    <button v-if="commentExtraDataHolder.viewerCanMinimize" :disabled="unminimizeLoading" class="popover-item btn-link dropdown-item" @click.stop="network_unminimizeThisComment">
+                                    <button v-if="graphqlData.viewerCanMinimize" :disabled="unminimizeLoading" class="popover-item btn-link dropdown-item" @click.stop="network_unminimizeThisComment">
                                         {{unminimizeLoading ? 'Trying...' : 'Unhide'}}
                                     </button>
-                                    <button v-if="commentExtraDataHolder.viewerCanDelete" class="popover-item btn-link text-red hover-red">
+                                    <button v-if="graphqlData.viewerCanDelete" class="popover-item btn-link text-red hover-red">
                                         Delete
                                     </button>
                                     <div class="dropdown-divider" v-if="viewerIsCollaborator().data"></div> 
@@ -257,8 +257,8 @@
     import CommentEditPane from './CommentEditPane'
     import Reactions from '../../Reactions'
     import {MinimizePane} from '../../../../../components'
-    import {mapActions} from 'vuex'
-    import * as actionTypes from '@/store/modules/graphqlListData/actionTypes'
+    import {mapActions,mapState} from 'vuex'
+    import * as actionTypes from '@/store/modules/graphqlData/actionTypes'
     export default {
         inject: ['commentExtraDataProvided','issue','viewerIsCollaborator','graphqlWritePermission','timelineItemDeletedHook'],
         data() {
@@ -309,29 +309,18 @@
             }
         },
         computed: {
+            nodeId() {
+                return this.data.node_id
+            },
             repo() {
                 return this.$route.params.repo
             },
             owner() {
                 return this.$route.params.owner
             },
-            commentExtraDataHolder() {
-                if(this.extraData) return this.extraData
-                let commentExtraDataHolder = this.commentExtraDataProvided().filter(item => {
-                    return item.id === this.data.node_id
-                })[0] || {}
-                if(commentExtraDataHolder.bodyHTML) {
-                    let pattern = /href="https:\/\/github\.com\/(\S+)"/g
-                    let execResult
-                    while((execResult = pattern.exec(commentExtraDataHolder.bodyHTML)) !== null) {
-                        commentExtraDataHolder.bodyHTML = commentExtraDataHolder.bodyHTML.replace(execResult[0],`href="/${execResult[1]}"`)
-                    }
-                }
-                return commentExtraDataHolder
-            },
             authorAssociation() {
-                if(this.commentExtraDataHolder.authorAssociation && this.commentExtraDataHolder.authorAssociation !== "NONE"){
-                    return this.commentExtraDataHolder.authorAssociation.toLowerCase()
+                if(this.graphqlData.authorAssociation && this.graphqlData.authorAssociation !== "NONE"){
+                    return this.graphqlData.authorAssociation.toLowerCase()
                 }
                 if((this.issue().user && this.issue().user.login) == (this.data.user && this.data.user.login)) return 'author'
                 return undefined
@@ -348,11 +337,14 @@
             },
         },
         created() {
-            if(this.commentType == 'issueComment') this.action_getIssueComment({id: this.data.node_id})
+            if(this.commentType == 'issueComment') this.action_getIssueCommentGraphqlData({
+                id: this.data.node_id,
+                graphql: graphql.NODES_ISSUE_COMMENT
+            })
         },
         methods: {
             ...mapActions({
-                action_getIssueComment: actionTypes.GET_ISSUE_COMMENTS
+                action_getIssueCommentGraphqlData: actionTypes.GET_NODES
             }),
             triggerShowMinimized() {
                 this.showMinimized = !this.showMinimized
diff --git a/src/pages/Repository/Issues/IssueDetail/components/TimelineItem/components/graphql.js b/src/pages/Repository/Issues/IssueDetail/components/TimelineItem/components/graphql.js
index bc75401..2840f83 100644
--- a/src/pages/Repository/Issues/IssueDetail/components/TimelineItem/components/graphql.js
+++ b/src/pages/Repository/Issues/IssueDetail/components/TimelineItem/components/graphql.js
@@ -20,4 +20,57 @@ query($id:ID!){
     }
   }
 }
-`
\ No newline at end of file
+`
+export const NODES_ISSUE_COMMENT = `
+query($ids:[ID!]!){
+    nodes(ids: $ids) {
+        ... on IssueComment {
+            id
+            isMinimized
+            minimizedReason
+            viewerCanDelete
+            viewerCanMinimize
+            viewerCanReact
+            viewerCanUpdate
+            viewerCannotUpdateReasons
+            viewerDidAuthor
+            userContentEdits {
+                totalCount
+            }
+            authorAssociation
+            EYES: reactions(content: EYES) {
+                totalCount
+                viewerHasReacted
+            }
+            ROCKET: reactions(content: ROCKET) {
+                totalCount
+                viewerHasReacted
+            }
+            HEART: reactions(content: HEART) {
+                totalCount
+                viewerHasReacted
+            }
+            CONFUSED: reactions(content: CONFUSED) {
+                totalCount
+                viewerHasReacted
+            }
+            HOORAY: reactions(content: HOORAY) {
+                totalCount
+                viewerHasReacted
+            }
+            LAUGH: reactions(content: LAUGH) {
+                totalCount
+                viewerHasReacted
+            }
+            THUMBS_UP: reactions(content: THUMBS_UP) {
+                totalCount
+                viewerHasReacted
+            }
+            THUMBS_DOWN: reactions(content: THUMBS_DOWN) {
+                totalCount
+                viewerHasReacted
+            }
+        }
+    }
+  }
+`
diff --git a/src/pages/Repository/components/CommitAuthorAvatar.vue b/src/pages/Repository/components/CommitAuthorAvatar.vue
index 3f23303..d0b705a 100644
--- a/src/pages/Repository/components/CommitAuthorAvatar.vue
+++ b/src/pages/Repository/components/CommitAuthorAvatar.vue
@@ -14,21 +14,19 @@
 <script>
 import styled from 'vue-styled-components'
 import {ImgWrapper} from '@/components'
-import {mapState} from 'vuex'
 export default {
     props: {
-        commit: {
-            type: Object,
-            required: true
-        }
+        commit: Object
     },
     computed: {
-        ...mapState({
-            commitAuthors(state){
-                let authorsHolder = state.graphqlListData.commits.filter(i => i.id == this.commit.node_id)[0]
-                if(authorsHolder) return authorsHolder.authors.nodes
-            } 
-        }),
+        nodeId() {
+            return this.commit.node_id
+        },
+        commitAuthors() {
+            if(this.graphqlData) {
+                return this.graphqlData.authors.nodes
+            }
+        }
     },
     components: {
         ImgWrapper,
diff --git a/src/pages/Repository/components/CommitStatusIcon.vue b/src/pages/Repository/components/CommitStatusIcon.vue
index d4f97b4..e48ece6 100644
--- a/src/pages/Repository/components/CommitStatusIcon.vue
+++ b/src/pages/Repository/components/CommitStatusIcon.vue
@@ -13,12 +13,12 @@
             commit: Object
         },
         computed:{
-            ...mapState({
-               commitState(state) {
-                   let dataHolder = state.graphqlListData.commits.filter(i => i.id == this.commit.node_id) [0]
-                   if(dataHolder) return dataHolder.status && dataHolder.status.state
-               } 
-            }),
+            nodeId() {
+                return this.commit.node_id
+            },
+            commitState() {
+                if(this.graphqlData) return this.graphqlData.status.state
+            },
             repo() {
                 return this.$route.params.repo
             },
diff --git a/src/plugin/githubBusiness/index.js b/src/plugin/githubBusiness/index.js
index a2bf4f2..9643562 100644
--- a/src/plugin/githubBusiness/index.js
+++ b/src/plugin/githubBusiness/index.js
@@ -9,7 +9,11 @@ export default {
         Vue.mixin({
             computed: {
                 ...mapState({
-                    accessToken: state => state.oauth.accessToken.accessToken
+                    accessToken: state => state.oauth.accessToken.accessToken,
+                    graphqlData(state) {
+                        if(!this.nodeId) return 
+                        return state.graphqlData.nodes.filter(i => i.id == this.nodeId)[0] || {}
+                    }
                 }),
                 repo() {
                     return this.$route.params.repo
diff --git a/src/store/index.js b/src/store/index.js
index 2687949..5f75281 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -13,7 +13,7 @@ import {
     topNoticeStore,
     dirtyStore,
     pullRequestDetailStore,
-    graphqlListDataStore
+    graphqlDataStore
 } from "./modules"
 
 export default new Vuex.Store ({
@@ -28,7 +28,7 @@ export default new Vuex.Store ({
         topNotice: topNoticeStore,
         dirty: dirtyStore,
         pullRequestDetail: pullRequestDetailStore,
-        graphqlListData: graphqlListDataStore
+        graphqlData: graphqlDataStore
     },
     plugins: [
         createPersistedState({
diff --git a/src/store/modules/graphqlData/actionTypes.js b/src/store/modules/graphqlData/actionTypes.js
new file mode 100644
index 0000000..334d492
--- /dev/null
+++ b/src/store/modules/graphqlData/actionTypes.js
@@ -0,0 +1,2 @@
+export const GET_NODES = 'GET_NODES'
+export const GET_NODES_EXECUTOR = 'GET_NODES_EXECUTOR'
\ No newline at end of file
diff --git a/src/store/modules/graphqlData/actions.js b/src/store/modules/graphqlData/actions.js
new file mode 100644
index 0000000..893aa9a
--- /dev/null
+++ b/src/store/modules/graphqlData/actions.js
@@ -0,0 +1,60 @@
+import * as actionTypes from './actionTypes'
+import * as mutationTypes from './mutationTypes'
+import {util_throttle} from '@/util'
+import {authRequiredGitHubGraphqlApiQuery} from '@/network'
+import * as graphql from './graphql'
+
+let nodesQueue = {}
+
+function consoleGraphqlError(graphqlRes) {
+    let errors = graphqlRes.data && graphqlRes.data.errors
+    if(errors) {
+        errors.forEach((i,index) => {
+            console.log(i.message)
+        })
+    }
+}
+
+export default {
+    async [actionTypes.GET_NODES_EXECUTOR](context,payload) {
+        try {
+            let res = await authRequiredGitHubGraphqlApiQuery(payload.graphql,{
+                variables: {
+                    ids: payload.ids,
+                }
+            })
+            let nodes = []
+            try{
+                nodes = res.data.data.nodes
+            }catch(e) {
+                consoleGraphqlError(res)
+            }
+            if(nodes.length > 0) {
+                context.commit(mutationTypes.RESOLVE_DATA,{data:nodes})
+            }
+        } catch (e) {
+            console.log(e)
+        }
+    },
+
+    async [actionTypes.GET_NODES](context,payload) {
+        if(payload.sync) {
+            await context.dispatch(actionTypes.GET_NODES_EXECUTOR,{ids: [payload.id],graphql:payload.graphql})
+        }else{
+            if(!nodesQueue[payload.graphql]) {
+                nodesQueue[payload.graphql] = [payload.id]
+            } else {
+                nodesQueue[payload.graphql].push(payload.id) 
+            }
+            util_throttle.throttleByDelay(() => {
+                let _nodesQueue = nodesQueue
+                nodesQueue = {}
+                Promise.all(Object.keys(_nodesQueue).map(graphql => {
+                    context.dispatch(actionTypes.GET_NODES_EXECUTOR,{ids: _nodesQueue[graphql], graphql:graphql})
+                }))
+            }, 50, window)
+        }
+        
+    },
+
+}
\ No newline at end of file
diff --git a/src/store/modules/graphqlListData/graphql.js b/src/store/modules/graphqlData/graphql.js
similarity index 100%
rename from src/store/modules/graphqlListData/graphql.js
rename to src/store/modules/graphqlData/graphql.js
diff --git a/src/store/modules/graphqlListData/index.js b/src/store/modules/graphqlData/index.js
similarity index 100%
rename from src/store/modules/graphqlListData/index.js
rename to src/store/modules/graphqlData/index.js
diff --git a/src/store/modules/graphqlListData/mutationTypes.js b/src/store/modules/graphqlData/mutationTypes.js
similarity index 100%
rename from src/store/modules/graphqlListData/mutationTypes.js
rename to src/store/modules/graphqlData/mutationTypes.js
diff --git a/src/store/modules/graphqlData/mutations.js b/src/store/modules/graphqlData/mutations.js
new file mode 100644
index 0000000..df53ae7
--- /dev/null
+++ b/src/store/modules/graphqlData/mutations.js
@@ -0,0 +1,18 @@
+import * as mutationTypes from './mutationTypes'
+import Vue from 'vue'
+export default {
+    [mutationTypes.RESOLVE_DATA] (state,payload) {
+        payload.data.forEach(i => {
+            let existOneIdx
+            let existOne = state.nodes.filter((i_,idx) => {
+                if(i_.id == i.id) existOneIdx = idx
+                return i_.id == i.id
+            })[0]
+            if(existOne) {
+                Vue.set(state.nodes,existOneIdx,Object.assign(existOne,i))
+               }else{
+                state.nodes.push(i)
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/src/store/modules/graphqlData/state.js b/src/store/modules/graphqlData/state.js
new file mode 100644
index 0000000..64a88fa
--- /dev/null
+++ b/src/store/modules/graphqlData/state.js
@@ -0,0 +1,3 @@
+export default {
+    nodes:  [],
+}
\ No newline at end of file
diff --git a/src/store/modules/graphqlListData/actionTypes.js b/src/store/modules/graphqlListData/actionTypes.js
deleted file mode 100644
index b37c3a1..0000000
--- a/src/store/modules/graphqlListData/actionTypes.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const GET_NODES = 'GET_NODES'
-export const GET_COMMITS = 'GET_COMMITS'
-export const GET_ISSUE_COMMENTS = 'GET_ISSUE_COMMENTS'
\ No newline at end of file
diff --git a/src/store/modules/graphqlListData/actions.js b/src/store/modules/graphqlListData/actions.js
deleted file mode 100644
index ce9e3c9..0000000
--- a/src/store/modules/graphqlListData/actions.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import * as actionTypes from './actionTypes'
-import * as mutationTypes from './mutationTypes'
-import {util_throttle} from '@/util'
-import {authRequiredGitHubGraphqlApiQuery} from '@/network'
-import * as graphql from './graphql'
-
-let commitsQueue = []
-let issueCommentsQueue = []
-
-function consoleGraphqlError(graphqlRes) {
-    let errors = graphqlRes.data && graphqlRes.data.errors
-    if(errors) {
-        errors.forEach((i,index) => {
-            console.log(i.message)
-        })
-    }
-}
-
-export default {
-    async [actionTypes.GET_NODES](context,payload) {
-        payload = {
-            fields:['authors','state'],
-            ...payload
-        }
-        try {
-            let _ids = payload.ids
-            payload.ids = []
-            let res = await authRequiredGitHubGraphqlApiQuery(payload.graphql,{
-                variables: {
-                    ids: _ids,
-                    withAuthors: payload.fields.some(i => i == 'authors'),
-                    withState: payload.fields.some(i => i == 'state'),
-                }
-            })
-            let nodes = []
-            try{
-                nodes = res.data.data.nodes
-            }catch(e) {
-                consoleGraphqlError(res)
-            }
-
-            if(nodes.length > 0) {
-                context.commit(mutationTypes.RESOLVE_DATA,{data:nodes,mutationCrumbs:payload.mutationCrumbs})
-            }
-        } catch (e) {
-            console.log(e)
-        }
-    },
-
-    [actionTypes.GET_COMMITS](context,payload) {
-        if(!commitsQueue.some(i => i == payload.id)) commitsQueue.push(payload.id)
-        util_throttle.throttleByDelay(() => {
-            context.dispatch(actionTypes.GET_NODES,{ids:commitsQueue,graphql:graphql.NODES_COMMIT,mutationCrumbs:['commits']})
-        }, 50, window)
-    },
-
-    [actionTypes.GET_ISSUE_COMMENTS](context,payload) {
-        if(!issueCommentsQueue.some(i => i == payload.id)) issueCommentsQueue.push(payload.id)
-        util_throttle.throttleByDelay(() => {
-            context.dispatch(actionTypes.GET_NODES,{ids:issueCommentsQueue,graphql:graphql.NODES_ISSUE_COMMENT,mutationCrumbs:['issueComments']})
-        }, 50, window)
-    },
-
-}
\ No newline at end of file
diff --git a/src/store/modules/graphqlListData/mutations.js b/src/store/modules/graphqlListData/mutations.js
deleted file mode 100644
index f14759b..0000000
--- a/src/store/modules/graphqlListData/mutations.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as mutationTypes from './mutationTypes'
-
-export default {
-    [mutationTypes.RESOLVE_DATA] (state,payload) {
-        let mutationCrumbs = payload.mutationCrumbs
-        let stateDataHolder
-        mutationCrumbs.forEach(i => {
-            if(!stateDataHolder) {
-                stateDataHolder = state[i]
-            } else {
-                stateDataHolder = stateDataHolder[i]
-            }
-        })
-        if(stateDataHolder) {
-            payload.data.forEach(i => {
-                if(!stateDataHolder.some((i_,index,arr) =>{
-                    if(i_.id == i.id) {
-                        arr.splice(index,1,i)
-                    }
-                    return i_.id == i.id
-                })){
-                    stateDataHolder.push(i)
-                }
-            })
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/store/modules/graphqlListData/state.js b/src/store/modules/graphqlListData/state.js
deleted file mode 100644
index 5145b55..0000000
--- a/src/store/modules/graphqlListData/state.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-    commits:  [],
-    issueComments:  [],
-}
\ No newline at end of file
diff --git a/src/store/modules/index.js b/src/store/modules/index.js
index 01b6ec9..6ff168a 100644
--- a/src/store/modules/index.js
+++ b/src/store/modules/index.js
@@ -7,6 +7,6 @@ import notificationsStore from './notifications'
 import topNoticeStore from './topNotice'
 import dirtyStore from './dirty'
 import pullRequestDetailStore from './pullRequestDetail'
-import graphqlListDataStore from './graphqlListData'
+import graphqlDataStore from './graphqlData'
 
-export { oauthStore, homeStore, searchStore, repositoryStore, issuesStore, notificationsStore, topNoticeStore, dirtyStore, pullRequestDetailStore, graphqlListDataStore }
\ No newline at end of file
+export { oauthStore, homeStore, searchStore, repositoryStore, issuesStore, notificationsStore, topNoticeStore, dirtyStore, pullRequestDetailStore, graphqlDataStore }
\ No newline at end of file