diff --git a/src/github/queries.gql b/src/github/queries.gql
index b8f0bec5ba..e5971d7ac4 100644
--- a/src/github/queries.gql
+++ b/src/github/queries.gql
@@ -125,6 +125,51 @@ fragment PullRequestFragment on PullRequest {
 	}
 }
 
+fragment ReviewComment on PullRequestReviewComment {
+	id
+	databaseId
+	url
+	author {
+		login
+		avatarUrl
+		url
+		... on User {
+			email
+			id
+		}
+		... on Organization {
+			email
+			id
+		}
+		... on Bot {
+			id
+		}
+	}
+	path
+	originalPosition
+	body
+	bodyHTML
+	diffHunk
+	position
+	state
+	pullRequestReview {
+		databaseId
+	}
+	commit {
+		oid
+	}
+	replyTo {
+		databaseId
+	}
+	createdAt
+	originalCommit {
+		oid
+	}
+	...Reactable
+	viewerCanUpdate
+	viewerCanDelete
+}
+
 query PullRequest($owner: String!, $name: String!, $number: Int!) {
 	repository(owner: $owner, name: $name) {
 		pullRequest(number: $number) {
@@ -173,6 +218,35 @@ query PullRequestMergeabilityMergeRequirements($owner: String!, $name: String!,
 	}
 }
 
+query GetReviewRequests($owner: String!, $name: String!, $number: Int!) {
+	repository(owner: $owner, name: $name) {
+		pullRequest(number: $number) {
+			reviewRequests(first: 100) {
+				nodes {
+					requestedReviewer {
+						... on User {
+							login
+							avatarUrl
+							id
+							url
+							email
+							name
+						}
+						... on Bot {
+							id
+							login
+							avatarUrl
+						}
+					}
+				}
+			}
+		}
+	}
+	rateLimit {
+		...RateLimit
+	}
+}
+
 mutation CreatePullRequest($input: CreatePullRequestInput!) {
 	createPullRequest(input: $input) {
 		pullRequest {
diff --git a/src/github/queriesExtra.gql b/src/github/queriesExtra.gql
index e59003effe..a6f8a20817 100644
--- a/src/github/queriesExtra.gql
+++ b/src/github/queriesExtra.gql
@@ -134,6 +134,51 @@ fragment PullRequestFragment on PullRequest {
 	}
 }
 
+fragment ReviewComment on PullRequestReviewComment {
+	id
+	databaseId
+	url
+	author {
+		login
+		avatarUrl
+		url
+		... on User {
+			email
+			id
+		}
+		... on Organization {
+			email
+			id
+		}
+		... on Bot {
+			id
+		}
+	}
+	path
+	originalPosition
+	body
+	bodyHTML
+	diffHunk
+	position
+	state
+	pullRequestReview {
+		databaseId
+	}
+	commit {
+		oid
+	}
+	replyTo {
+		databaseId
+	}
+	createdAt
+	originalCommit {
+		oid
+	}
+	...Reactable
+	viewerCanUpdate
+	viewerCanDelete
+}
+
 query PullRequest($owner: String!, $name: String!, $number: Int!) {
 	repository(owner: $owner, name: $name) {
 		pullRequest(number: $number) {
@@ -182,6 +227,35 @@ query PullRequestMergeabilityMergeRequirements($owner: String!, $name: String!,
 	}
 }
 
+query GetReviewRequests($owner: String!, $name: String!, $number: Int!) {
+	repository(owner: $owner, name: $name) {
+		pullRequest(number: $number) {
+			reviewRequests(first: 100) {
+				nodes {
+					requestedReviewer {
+						... on User {
+							login
+							avatarUrl
+							id
+							url
+							email
+							name
+						}
+						... on Bot {
+							id
+							login
+							avatarUrl
+						}
+					}
+				}
+			}
+		}
+	}
+	rateLimit {
+		...RateLimit
+	}
+}
+
 mutation CreatePullRequest($input: CreatePullRequestInput!) {
 	createPullRequest(input: $input) {
 		pullRequest {
diff --git a/src/github/queriesLimited.gql b/src/github/queriesLimited.gql
index 1fca7b66c4..b127b49c09 100644
--- a/src/github/queriesLimited.gql
+++ b/src/github/queriesLimited.gql
@@ -116,6 +116,48 @@ fragment PullRequestFragment on PullRequest {
 	}
 }
 
+fragment ReviewComment on PullRequestReviewComment {
+	id
+	databaseId
+	url
+	author {
+		login
+		avatarUrl
+		url
+		... on User {
+			email
+			id
+		}
+		... on Organization {
+			email
+			id
+		}
+	}
+	path
+	originalPosition
+	body
+	bodyHTML
+	diffHunk
+	position
+	state
+	pullRequestReview {
+		databaseId
+	}
+	commit {
+		oid
+	}
+	replyTo {
+		databaseId
+	}
+	createdAt
+	originalCommit {
+		oid
+	}
+	...Reactable
+	viewerCanUpdate
+	viewerCanDelete
+}
+
 query PullRequest($owner: String!, $name: String!, $number: Int!) {
 	repository(owner: $owner, name: $name) {
 		pullRequest(number: $number) {
@@ -127,7 +169,6 @@ query PullRequest($owner: String!, $name: String!, $number: Int!) {
 	}
 }
 
-
 query PullRequestForHead($owner: String!, $name: String!, $headRefName: String!) {
 	repository(owner: $owner, name: $name) {
 		pullRequests(first: 3, headRefName: $headRefName, orderBy: { field: CREATED_AT, direction: DESC }) {
@@ -141,6 +182,29 @@ query PullRequestForHead($owner: String!, $name: String!, $headRefName: String!)
 	}
 }
 
+query GetReviewRequests($owner: String!, $name: String!, $number: Int!) {
+	repository(owner: $owner, name: $name) {
+		pullRequest(number: $number) {
+			reviewRequests(first: 100) {
+				nodes {
+					requestedReviewer {
+						... on User {
+							login
+							avatarUrl
+							id
+							url
+							email
+							name
+						}
+					}
+				}
+			}
+		}
+	}
+	rateLimit {
+		...RateLimit
+	}
+}
 
 mutation CreatePullRequest($input: CreatePullRequestInput!) {
 	createPullRequest(input: $input) {
diff --git a/src/github/queriesShared.gql b/src/github/queriesShared.gql
index 02b2544bf2..54c840cc63 100644
--- a/src/github/queriesShared.gql
+++ b/src/github/queriesShared.gql
@@ -343,80 +343,6 @@ query GetReviewRequestsAdditionalScopes($owner: String!, $name: String!, $number
 	}
 }
 
-query GetReviewRequests($owner: String!, $name: String!, $number: Int!) {
-	repository(owner: $owner, name: $name) {
-		pullRequest(number: $number) {
-			reviewRequests(first: 100) {
-				nodes {
-					requestedReviewer {
-						... on User {
-							login
-							avatarUrl
-							id
-							url
-							email
-							name
-						}
-						... on Bot {
-							id
-							login
-							avatarUrl
-						}
-					}
-				}
-			}
-		}
-	}
-	rateLimit {
-		...RateLimit
-	}
-}
-
-fragment ReviewComment on PullRequestReviewComment {
-	id
-	databaseId
-	url
-	author {
-		login
-		avatarUrl
-		url
-		... on User {
-			email
-			id
-		}
-		... on Organization {
-			email
-			id
-		}
-		... on Bot {
-			id
-		}
-	}
-	path
-	originalPosition
-	body
-	bodyHTML
-	diffHunk
-	position
-	state
-	pullRequestReview {
-		databaseId
-	}
-	commit {
-		oid
-	}
-	replyTo {
-		databaseId
-	}
-	createdAt
-	originalCommit {
-		oid
-	}
-	...Reactable
-	viewerCanUpdate
-	viewerCanDelete
-}
-
 query GetParticipants($owner: String!, $name: String!, $number: Int!, $first: Int!) {
 	repository(owner: $owner, name: $name) {
 		pullRequest(number: $number) {