diff --git a/distributor-node/src/services/networking/query-node/schema.graphql b/distributor-node/src/services/networking/query-node/schema.graphql
index 59bf0630c5..d311147aa7 100644
--- a/distributor-node/src/services/networking/query-node/schema.graphql
+++ b/distributor-node/src/services/networking/query-node/schema.graphql
@@ -2108,7 +2108,7 @@ type Proposal implements BaseGraphQLObject {
   proposalexecutedeventproposal: [ProposalExecutedEvent!]
 }
 
-union ProposalDetails = SignalProposalDetails | RuntimeUpgradeProposalDetails | FundingRequestProposalDetails | SetMaxValidatorCountProposalDetails | CreateWorkingGroupLeadOpeningProposalDetails | FillWorkingGroupLeadOpeningProposalDetails | UpdateWorkingGroupBudgetProposalDetails | DecreaseWorkingGroupLeadStakeProposalDetails | SlashWorkingGroupLeadProposalDetails | SetWorkingGroupLeadRewardProposalDetails | TerminateWorkingGroupLeadProposalDetails | AmendConstitutionProposalDetails | CancelWorkingGroupLeadOpeningProposalDetails | SetMembershipPriceProposalDetails | SetCouncilBudgetIncrementProposalDetails | SetCouncilorRewardProposalDetails | SetInitialInvitationBalanceProposalDetails | SetInitialInvitationCountProposalDetails | SetMembershipLeadInvitationQuotaProposalDetails | SetReferralCutProposalDetails | VetoProposalDetails | UpdateChannelPayoutsProposalDetails
+union ProposalDetails = SignalProposalDetails | RuntimeUpgradeProposalDetails | FundingRequestProposalDetails | SetMaxValidatorCountProposalDetails | CreateWorkingGroupLeadOpeningProposalDetails | FillWorkingGroupLeadOpeningProposalDetails | UpdateWorkingGroupBudgetProposalDetails | DecreaseWorkingGroupLeadStakeProposalDetails | SlashWorkingGroupLeadProposalDetails | SetWorkingGroupLeadRewardProposalDetails | TerminateWorkingGroupLeadProposalDetails | AmendConstitutionProposalDetails | CancelWorkingGroupLeadOpeningProposalDetails | SetMembershipPriceProposalDetails | SetCouncilBudgetIncrementProposalDetails | SetCouncilorRewardProposalDetails | SetInitialInvitationBalanceProposalDetails | SetInitialInvitationCountProposalDetails | SetMembershipLeadInvitationQuotaProposalDetails | SetReferralCutProposalDetails | VetoProposalDetails | UpdateChannelPayoutsProposalDetails | UpdateGlobalNftLimitProposalDetails
 
 union ProposalStatus = ProposalStatusDeciding | ProposalStatusGracing | ProposalStatusDormant | ProposalStatusVetoed | ProposalStatusExecuted | ProposalStatusExecutionFailed | ProposalStatusSlashed | ProposalStatusRejected | ProposalStatusExpired | ProposalStatusCancelled | ProposalStatusCanceledByRuntime
 
@@ -2826,6 +2826,14 @@ type UpdateChannelPayoutsProposalDetails {
   payloadHash: String
 }
 
+type UpdateGlobalNftLimitProposalDetails {
+  """New daily NFT limit set in the proposal (if any)"""
+  newDailyNftLimit: Int
+
+  """New weekly NFT limit set in the proposal (if any)"""
+  newWeeklyNftLimit: Int
+}
+
 type UpdateWorkingGroupBudgetProposalDetails {
   """
   Amount to increase / decrease the working group budget by (will be decudted from / appended to council budget accordingly)
diff --git a/eslint-local-rules.js b/eslint-local-rules.js
new file mode 100644
index 0000000000..f20f03a890
--- /dev/null
+++ b/eslint-local-rules.js
@@ -0,0 +1,24 @@
+module.exports = {
+  'no-throw': {
+    meta: {
+      type: 'problem',
+      docs: {
+        description: 'disallow the use of throw keyword',
+        category: 'Possible Errors',
+        recommended: true,
+      },
+      schema: [],
+    },
+
+    create: function (context) {
+      return {
+        ThrowStatement(node) {
+          context.report({
+            node: node,
+            message: "The use of 'throw' keyword is not allowed.",
+          })
+        },
+      }
+    },
+  },
+}
diff --git a/query-node/.prettierignore b/query-node/.prettierignore
new file mode 100644
index 0000000000..0ed04b87da
--- /dev/null
+++ b/query-node/.prettierignore
@@ -0,0 +1 @@
+chain-metadata/
diff --git a/query-node/CHANGELOG.md b/query-node/CHANGELOG.md
index eb5ec166fd..2444c11327 100644
--- a/query-node/CHANGELOG.md
+++ b/query-node/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 1.7.0
+
+- Refactor of mappings for more better handling of error cases. [#4856](https://github.com/Joystream/joystream/pull/4856)
+- Bug fix [#4855](https://github.com/Joystream/joystream/issues/4855)
+- Add support for UpdateGlobalNftLimit proposal. 
+
 ### 1.6.0
 
 - Store membership handles both as utf-8 string and raw bytes - [#4950](https://github.com/Joystream/joystream/pull/4950)
diff --git a/query-node/mappings/.eslintrc.js b/query-node/mappings/.eslintrc.js
index 91881aea67..dbcdac64b6 100644
--- a/query-node/mappings/.eslintrc.js
+++ b/query-node/mappings/.eslintrc.js
@@ -3,7 +3,9 @@ module.exports = {
   env: {
     node: true,
   },
+  plugins: ['eslint-plugin-local-rules'],
   rules: {
+    'local-rules/no-throw': 'error',
     '@typescript-eslint/naming-convention': 'off',
     // TODO: Remove all the rules below, they seem quite useful
     '@typescript-eslint/no-explicit-any': 'off',
diff --git a/query-node/mappings/package.json b/query-node/mappings/package.json
index 19959cd928..8c96d93315 100644
--- a/query-node/mappings/package.json
+++ b/query-node/mappings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "query-node-mappings",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Mappings for hydra-processor",
   "main": "lib/src/index.js",
   "license": "MIT",
@@ -16,14 +16,15 @@
     "bootstrap-data:fetch": "yarn bootstrap-data:fetch:members && yarn bootstrap-data:fetch:workingGroups && yarn bootstrap-data:fetch:categories"
   },
   "dependencies": {
-    "@polkadot/types": "8.9.1",
+    "@apollo/client": "^3.2.5",
     "@joystream/hydra-common": "5.0.0-alpha.4",
     "@joystream/hydra-db-utils": "5.0.0-alpha.4",
-    "@joystream/warthog": "^2.41.9",
     "@joystream/js": "^1.5.0",
-    "@apollo/client": "^3.2.5"
+    "@joystream/warthog": "^2.41.9",
+    "@polkadot/types": "8.9.1"
   },
   "devDependencies": {
+    "eslint-plugin-local-rules": "2.0.0",
     "prettier": "^2.2.1",
     "ts-node": "^10.2.1",
     "typescript": "^4.4.3"
diff --git a/query-node/mappings/src/common.ts b/query-node/mappings/src/common.ts
index 500d2f91a3..398aabbc8a 100644
--- a/query-node/mappings/src/common.ts
+++ b/query-node/mappings/src/common.ts
@@ -1,22 +1,29 @@
-import { DatabaseManager, SubstrateEvent, FindOneOptions } from '@joystream/hydra-common'
-import { Bytes, Option } from '@polkadot/types'
-import { Codec } from '@polkadot/types/types'
+import {
+  DatabaseManager,
+  FindOneOptions,
+  FindOptionsOrderValue,
+  FindOptionsWhere,
+  SubstrateEvent,
+} from '@joystream/hydra-common'
+import { AnyMetadataClass, DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
+import { metaToObject } from '@joystream/metadata-protobuf/utils'
 import { MemberId, WorkerId } from '@joystream/types/primitives'
+import { BaseModel } from '@joystream/warthog'
+import { Bytes, Option } from '@polkadot/types'
 import { PalletCommonWorkingGroupIterableEnumsWorkingGroup as WGType } from '@polkadot/types/lookup'
+import { Codec } from '@polkadot/types/types'
+import BN from 'bn.js'
 import {
-  Worker,
   Event,
-  Network,
-  WorkingGroup as WGEntity,
-  MetaprotocolTransactionStatusEvent,
+  Membership,
   MetaprotocolTransactionErrored,
+  MetaprotocolTransactionStatusEvent,
   MetaprotocolTransactionSuccessful,
-  Membership,
+  Network,
+  WorkingGroup as WGEntity,
+  Worker,
 } from 'query-node/dist/model'
-import { BaseModel } from '@joystream/warthog'
-import { metaToObject } from '@joystream/metadata-protobuf/utils'
-import { AnyMetadataClass, DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
-import BN from 'bn.js'
+import { In } from 'typeorm'
 
 export const CURRENT_NETWORK = Network.OLYMPIA
 
@@ -88,19 +95,20 @@ export function inconsistentState(extraInfo: string, data?: unknown): never {
   // log error
   logger.error(errorMessage, data)
 
+  // eslint-disable-next-line local-rules/no-throw
   throw errorMessage
 }
 
-/*
-  Reports that insurmountable unexpected data has been encountered and throws an exception.
-*/
-export function unexpectedData(extraInfo: string, data?: unknown): never {
-  const errorMessage = 'Unexpected data: ' + extraInfo
+/**
+ * Reports an unimplemented mapping/variant error for which a runtime implementation logic exists and is not filtered.
+ */
+export function unimplementedError(extraInfo: string, data?: unknown): never {
+  const errorMessage = 'unimplemented error: ' + extraInfo
 
   // log error
   logger.error(errorMessage, data)
 
-  throw errorMessage
+  process.exit(1)
 }
 
 /*
@@ -124,7 +132,7 @@ export function deserializeMetadata<T>(
     const message = metadataType.decode(metadataBytes.toU8a(true))
     Object.keys(message).forEach((key) => {
       if (key in message && typeof message[key] === 'string') {
-        message[key] = perpareString(message[key])
+        message[key] = prepareString(message[key])
       }
     })
     return metaToObject(metadataType, message)
@@ -145,7 +153,7 @@ export function bytesToString(b: Bytes): string {
   )
 }
 
-export function perpareString(s: string): string {
+export function prepareString(s: string): string {
   // eslint-disable-next-line no-control-regex
   return s.replace(/\u0000/g, '')
 }
@@ -211,55 +219,33 @@ export function getWorkingGroupModuleName(group: WGType): WorkingGroupModuleName
     return 'operationsWorkingGroupGamma'
   }
 
-  unexpectedData('Unsupported working group encountered:', group.type)
+  unimplementedError('Unsupported working group encountered:', group.type)
 }
 
-export async function getWorkingGroupByName(
+export async function getWorkingGroupByNameOrFail(
   store: DatabaseManager,
   name: WorkingGroupModuleName,
-  relations: string[] = []
+  relations: RelationsArr<WGEntity> = []
 ): Promise<WGEntity> {
-  const group = await store.get(WGEntity, { where: { name }, relations })
-  if (!group) {
-    return inconsistentState(`Working group ${name} not found!`)
-  }
-  return group
+  return getOneByOrFail(store, WGEntity, { name }, relations)
 }
 
-export async function getMemberById(
+export async function getMembershipById(
   store: DatabaseManager,
   id: MemberId,
-  relations: string[] = []
+  relations: RelationsArr<Membership> = []
 ): Promise<Membership> {
-  const member = await store.get(Membership, { where: { id: id.toString() }, relations })
-  if (!member) {
-    throw new Error(`Member(${id}) not found`)
-  }
-  return member
-}
-
-export async function getWorkingGroupLead(store: DatabaseManager, groupName: WorkingGroupModuleName) {
-  const lead = await store.get(Worker, { where: { groupId: groupName, isLead: true, isActive: true } })
-  if (!lead) {
-    return inconsistentState(`Couldn't find an active lead for ${groupName}`)
-  }
-
-  return lead
+  return getByIdOrFail(store, Membership, id.toString(), relations)
 }
 
-export async function getWorker(
+export async function getWorkerOrFail(
   store: DatabaseManager,
   groupName: WorkingGroupModuleName,
   runtimeId: WorkerId | number,
-  relations: string[] = []
+  relations: RelationsArr<Worker> = []
 ): Promise<Worker> {
   const workerDbId = `${groupName}-${runtimeId}`
-  const worker = await store.get(Worker, { where: { id: workerDbId }, relations })
-  if (!worker) {
-    return inconsistentState(`Expected worker not found by id ${workerDbId}`)
-  }
-
-  return worker
+  return getByIdOrFail(store, Worker, workerDbId, relations)
 }
 
 type EntityClass<T extends BaseModel> = {
@@ -277,15 +263,93 @@ export async function getById<T extends BaseModel>(
   entityClass: EntityClass<T>,
   id: string,
   relations?: RelationsArr<T>
+): Promise<T | undefined> {
+  return store.get(entityClass, { where: { id }, relations } as FindOneOptions<T>)
+}
+
+export async function getByIdOrFail<T extends BaseModel>(
+  store: DatabaseManager,
+  entityClass: EntityClass<T>,
+  id: string,
+  relations?: RelationsArr<T>,
+  errMessage?: string
+): Promise<T> {
+  const result = await getById<T>(store, entityClass, id, relations)
+  if (!result) {
+    // eslint-disable-next-line local-rules/no-throw
+    throw new Error(`Expected "${entityClass.name}" not found by ID: ${id} ${errMessage ? `- ${errMessage}` : ''}`)
+  }
+
+  return result
+}
+
+export async function getOneBy<T extends BaseModel>(
+  store: DatabaseManager,
+  entityClass: EntityClass<T>,
+  where?: FindOptionsWhere<T>,
+  relations?: RelationsArr<T>,
+  order?: Partial<{ [K in keyof T]: FindOptionsOrderValue }>
+): Promise<T | undefined> {
+  return store.get(entityClass, { where, relations, order } as FindOneOptions<T>)
+}
+
+/**
+ * Retrieves a entity by any field(s) or throws an error if not found
+ */
+export async function getOneByOrFail<T extends BaseModel>(
+  store: DatabaseManager,
+  entityClass: EntityClass<T>,
+  where?: FindOptionsWhere<T>,
+  relations?: RelationsArr<T>,
+  order?: Partial<{ [K in keyof T]: FindOptionsOrderValue }>,
+  errMessage?: string
 ): Promise<T> {
-  const result = await store.get(entityClass, { where: { id }, relations } as FindOneOptions<T>)
+  const result = await getOneBy(store, entityClass, where, relations, order)
   if (!result) {
-    throw new Error(`Expected ${entityClass.name} not found by ID: ${id}`)
+    // eslint-disable-next-line local-rules/no-throw
+    throw new Error(
+      `Expected "${entityClass.name}" not found by filter: ${JSON.stringify({
+        where,
+        relations,
+        order,
+      })} ${errMessage ? `- ${errMessage}` : ''}`
+    )
   }
 
   return result
 }
 
+export async function getManyBy<T extends BaseModel>(
+  store: DatabaseManager,
+  entityClass: EntityClass<T>,
+  entityIds: string[],
+  where?: FindOptionsWhere<T>,
+  relations?: RelationsArr<T>
+): Promise<T[]> {
+  return store.getMany(entityClass, { where: { id: In(entityIds), ...where }, relations } as FindOneOptions<T>)
+}
+
+export async function getManyByOrFail<T extends BaseModel>(
+  store: DatabaseManager,
+  entityClass: EntityClass<T>,
+  entityIds: string[],
+  where?: FindOptionsWhere<T>,
+  relations?: RelationsArr<T>,
+  errMessage?: string
+): Promise<T[]> {
+  const entities = await getManyBy(store, entityClass, entityIds, where, relations)
+  const loadedEntityIds = entities.map((item) => item.id)
+  if (loadedEntityIds.length !== entityIds.length) {
+    const missingIds = entityIds.filter((item) => !loadedEntityIds.includes(item))
+
+    // eslint-disable-next-line local-rules/no-throw
+    throw new Error(
+      `"${entityClass.name}" missing records for following IDs: ${missingIds} ${errMessage ? `- ${errMessage}` : ''}`
+    )
+  }
+  return entities
+}
+
 export function deterministicEntityId(createdInEvent: SubstrateEvent, additionalIdentifier?: string | number): string {
   return (
     `${createdInEvent.blockNumber}-${createdInEvent.indexInBlock}` +
@@ -332,10 +396,10 @@ export async function saveMetaprotocolTransactionSuccessful(
 export async function saveMetaprotocolTransactionErrored(
   store: DatabaseManager,
   event: SubstrateEvent,
-  message: string
+  error: MetaprotocolTxError
 ): Promise<void> {
   const status = new MetaprotocolTransactionErrored()
-  status.message = message
+  status.message = error
 
   const metaprotocolTransaction = new MetaprotocolTransactionStatusEvent({
     ...genericEventFields(event),
@@ -344,3 +408,30 @@ export async function saveMetaprotocolTransactionErrored(
 
   await store.save(metaprotocolTransaction)
 }
+
+export enum MetaprotocolTxError {
+  InvalidMetadata = 'InvalidMetadata',
+
+  // App errors
+  AppAlreadyExists = 'AppAlreadyExists',
+  AppNotFound = 'AppNotFound',
+  InvalidAppOwnerMember = 'InvalidAppOwnerMember',
+
+  // Video errors
+  VideoNotFound = 'VideoNotFound',
+  VideoNotFoundInChannel = 'VideoNotFoundInChannel',
+  VideoReactionsDisabled = 'VideoReactionsDisabled',
+
+  // Comment errors
+  CommentSectionDisabled = 'CommentSectionDisabled',
+  CommentNotFound = 'CommentNotFound',
+  ParentCommentNotFound = 'ParentCommentNotFound',
+  InvalidCommentAuthor = 'InvalidCommentAuthor',
+
+  // Membership error
+  MemberNotFound = 'MemberNotFound',
+  MemberBannedFromChannel = 'MemberBannedFromChannel',
+
+  // Channel errors
+  InvalidChannelRewardAccount = 'InvalidChannelRewardAccount',
+}
diff --git a/query-node/mappings/src/content/app.ts b/query-node/mappings/src/content/app.ts
index 6fc4b2c064..38aff1e309 100644
--- a/query-node/mappings/src/content/app.ts
+++ b/query-node/mappings/src/content/app.ts
@@ -3,32 +3,28 @@ import { ICreateApp, IUpdateApp } from '@joystream/metadata-protobuf'
 import { DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
 import { integrateMeta } from '@joystream/metadata-protobuf/utils'
 import { App, Membership } from 'query-node/dist/model'
-import { logger, unexpectedData } from '../common'
+import { MetaprotocolTxError, getById, getOneBy, logger } from '../common'
 
 export async function processCreateAppMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
   metadata: DecodedMetadataObject<ICreateApp>,
-  memberId: string
-): Promise<void> {
+  member: Membership
+): Promise<App | MetaprotocolTxError> {
   const { name, appMetadata } = metadata
 
   const appId = `${event.blockNumber}-${event.indexInBlock}`
 
-  const isAppExists = await store.get(App, {
-    where: {
-      name: metadata.name,
-    },
-  })
+  const isAppExists = await getOneBy(store, App, { name })
 
   if (isAppExists) {
-    unexpectedData('App already exists', { name })
+    return MetaprotocolTxError.AppAlreadyExists
   }
 
   const newApp = new App({
     name,
     id: appId,
-    ownerMember: new Membership({ id: memberId }),
+    ownerMember: member,
     websiteUrl: appMetadata?.websiteUrl || undefined,
     useUri: appMetadata?.useUri || undefined,
     smallIcon: appMetadata?.smallIcon || undefined,
@@ -43,23 +39,25 @@ export async function processCreateAppMessage(
   })
   await store.save<App>(newApp)
   logger.info('App has been created', { name })
+
+  return newApp
 }
 
 export async function processUpdateAppMessage(
   store: DatabaseManager,
   metadata: DecodedMetadataObject<IUpdateApp>,
-  memberId: string
-): Promise<void> {
+  member: Membership
+): Promise<App | MetaprotocolTxError> {
   const { appId, appMetadata } = metadata
 
-  const app = await getAppById(store, appId)
+  const app = await getById(store, App, appId, ['ownerMember'])
 
   if (!app) {
-    unexpectedData("App doesn't exists", { appId })
+    return MetaprotocolTxError.AppNotFound
   }
 
-  if (app.ownerMember.id !== memberId) {
-    unexpectedData("App doesn't belong to the member", { appId, memberId })
+  if (app.ownerMember.id !== member.id) {
+    return MetaprotocolTxError.InvalidAppOwnerMember
   }
 
   if (appMetadata) {
@@ -80,15 +78,5 @@ export async function processUpdateAppMessage(
 
   await store.save<App>(app)
   logger.info('App has been updated', { appId })
-}
-
-export async function getAppById(store: DatabaseManager, appId: string): Promise<App | undefined> {
-  const app = await store.get(App, {
-    where: {
-      id: appId,
-    },
-    relations: ['ownerMember'],
-  })
-
   return app
 }
diff --git a/query-node/mappings/src/content/channel.ts b/query-node/mappings/src/content/channel.ts
index 2f974f00a3..dd73c967e0 100644
--- a/query-node/mappings/src/content/channel.ts
+++ b/query-node/mappings/src/content/channel.ts
@@ -9,7 +9,7 @@ import {
   ChannelOwnerRemarked,
   IMakeChannelPayment,
 } from '@joystream/metadata-protobuf'
-import { ChannelId, DataObjectId, MemberId } from '@joystream/types/primitives'
+import { DataObjectId } from '@joystream/types/primitives'
 import { BTreeMap, BTreeSet, u64 } from '@polkadot/types'
 import {
   Channel,
@@ -23,6 +23,7 @@ import {
   ChannelRewardClaimedEvent,
   ChannelVisibilitySetByModeratorEvent,
   Collaborator,
+  Comment,
   ContentActor,
   ContentActorCurator,
   ContentActorMember,
@@ -33,22 +34,21 @@ import {
   MetaprotocolTransactionSuccessful,
   PaymentContextChannel,
   PaymentContextVideo,
-  StorageBag,
   StorageDataObject,
   Video,
 } from 'query-node/dist/model'
 import { FindOptionsWhere, In } from 'typeorm'
 import {
+  MetaprotocolTxError,
   bytesToString,
   deserializeMetadata,
   genericEventFields,
-  getMemberById,
-  inconsistentState,
+  getOneBy,
   invalidMetadata,
   logger,
   saveMetaprotocolTransactionErrored,
   saveMetaprotocolTransactionSuccessful,
-  unexpectedData,
+  unimplementedError,
   unwrap,
 } from '../common'
 import {
@@ -60,6 +60,7 @@ import {
 import {
   convertChannelOwnerToMemberOrCuratorGroup,
   convertContentActor,
+  getChannelOrFail,
   mapAgentPermission,
   processAppActionMetadata,
   processChannelMetadata,
@@ -114,12 +115,6 @@ export async function content_ChannelCreated(ctx: EventContext & StoreContext):
 
   // deserialize & process metadata
   if (channelCreationParameters.meta.isSome) {
-    const storageBag = await store.get(StorageBag, { where: { id: `dynamic:channel:${channelId.toString()}` } })
-
-    if (!storageBag) {
-      inconsistentState(`storageBag for channel ${channelId} does not exist`)
-    }
-
     const appAction = deserializeMetadata(AppAction, channelCreationParameters.meta.unwrap(), { skipWarning: true })
 
     if (appAction) {
@@ -165,26 +160,13 @@ export async function content_ChannelUpdated(ctx: EventContext & StoreContext):
   const [, channelId, channelUpdateParameters, newDataObjects] = new ChannelUpdatedEvent_V1001(event).params
 
   // load channel
-  const channel = await store.get(Channel, {
-    where: { id: channelId.toString() },
-  })
-
-  // ensure channel exists
-  if (!channel) {
-    return inconsistentState('Non-existing channel update requested', channelId)
-  }
+  const channel = await getChannelOrFail(store, channelId.toString())
 
   // prepare changed metadata
   const newMetadataBytes = channelUpdateParameters.newMeta.unwrapOr(null)
 
   //  update metadata if it was changed
   if (newMetadataBytes) {
-    const storageBag = await store.get(StorageBag, { where: { id: `dynamic:channel:${channelId.toString()}` } })
-
-    if (!storageBag) {
-      inconsistentState(`storageBag for channel ${channelId} does not exist`)
-    }
-
     const newMetadata = deserializeMetadata(AppAction, newMetadataBytes, { skipWarning: true })
 
     if (newMetadata) {
@@ -280,14 +262,7 @@ export async function content_ChannelVisibilitySetByModerator({
   const [actor, channelId, isCensored, rationale] = new ChannelVisibilitySetByModeratorEvent_V1001(event).params
 
   // load channel
-  const channel = await store.get(Channel, {
-    where: { id: channelId.toString() },
-  })
-
-  // ensure channel exists
-  if (!channel) {
-    return inconsistentState('Non-existing channel censoring requested', channelId)
-  }
+  const channel = await getChannelOrFail(store, channelId.toString())
 
   // update channel
   channel.isCensored = isCensored.isTrue
@@ -317,15 +292,7 @@ export async function content_ChannelOwnerRemarked(ctx: EventContext & StoreCont
   const [channelId, message] = new ChannelOwnerRemarkedEvent_V1001(ctx.event).params
 
   // load channel
-  const channel = await store.get(Channel, {
-    where: { id: channelId.toString() },
-    relations: ['ownerMember', 'ownerCuratorGroup'],
-  })
-
-  // ensure channel exists
-  if (!channel) {
-    return inconsistentState('Owner Remarked for Non-existing channel', channelId)
-  }
+  const channel = await getChannelOrFail(store, channelId.toString(), ['ownerMember', 'ownerCuratorGroup'])
 
   const getContentActor = (ownerMember?: Membership, ownerCuratorGroup?: CuratorGroup) => {
     if (ownerMember) {
@@ -340,23 +307,18 @@ export async function content_ChannelOwnerRemarked(ctx: EventContext & StoreCont
       return actor
     }
 
-    return inconsistentState('Unknown content actor', { ownerMember, ownerCuratorGroup })
+    return unimplementedError('Unsupported content actor type')
   }
 
-  try {
-    const decodedMessage = ChannelOwnerRemarked.decode(message.toU8a(true))
-    const contentActor = getContentActor(channel.ownerMember, channel.ownerCuratorGroup)
-    const metaTransactionInfo = await processOwnerRemark(store, event, channelId, contentActor, decodedMessage)
-
-    await saveMetaprotocolTransactionSuccessful(store, event, metaTransactionInfo)
-    // emit log event
-    logger.info('Channel owner remarked', { decodedMessage })
-  } catch (e) {
-    // emit log event
-    logger.info(`Bad metadata for channel owner's remark`, { e })
+  const metadata = ChannelOwnerRemarked.decode(message.toU8a(true))
+  const contentActor = getContentActor(channel.ownerMember, channel.ownerCuratorGroup)
+  const metaprotocolTxResult = await processOwnerRemark(store, event, channel, contentActor, metadata)
 
-    // save metaprotocol info
-    await saveMetaprotocolTransactionErrored(store, event, `Bad metadata for channel's owner`)
+  if (metaprotocolTxResult instanceof MetaprotocolTransactionSuccessful) {
+    await saveMetaprotocolTransactionSuccessful(store, event, metaprotocolTxResult)
+  } else {
+    await saveMetaprotocolTransactionErrored(store, event, metaprotocolTxResult)
+    invalidMetadata(`Bad metadata for channel owner's remark:`, { metadata, metaprotocolTxResult })
   }
 }
 
@@ -364,21 +326,18 @@ export async function content_ChannelAgentRemarked(ctx: EventContext & StoreCont
   const { event, store } = ctx
   const [moderator, channelId, message] = new ChannelAgentRemarkedEvent_V1001(ctx.event).params
 
-  try {
-    const decodedMessage = ChannelModeratorRemarked.decode(message.toU8a(true))
-    const contentActor = await convertContentActor(store, moderator)
-
-    const metaTransactionInfo = await processModeratorRemark(store, event, channelId, contentActor, decodedMessage)
+  // load channel
+  const channel = await getChannelOrFail(store, channelId.toString())
 
-    await saveMetaprotocolTransactionSuccessful(store, event, metaTransactionInfo)
-    // emit log event
-    logger.info('Channel moderator remarked', { decodedMessage })
-  } catch (e) {
-    // emit log event
-    logger.info(`Bad metadata for channel moderator's remark`, { e })
+  const metadata = ChannelModeratorRemarked.decode(message.toU8a(true))
+  const contentActor = await convertContentActor(store, moderator)
+  const metaprotocolTxResult = await processModeratorRemark(store, event, channel, contentActor, metadata)
 
-    // save metaprotocol info
-    await saveMetaprotocolTransactionErrored(store, event, `Bad metadata for channel's remark`)
+  if (metaprotocolTxResult instanceof MetaprotocolTransactionSuccessful) {
+    await saveMetaprotocolTransactionSuccessful(store, event, metaprotocolTxResult)
+  } else {
+    await saveMetaprotocolTransactionErrored(store, event, metaprotocolTxResult)
+    invalidMetadata(`Bad metadata for channel_agent_remark:`, { metadata, metaprotocolTxResult })
   }
 }
 
@@ -412,71 +371,95 @@ async function updateChannelAgentsPermissions(
 async function processOwnerRemark(
   store: DatabaseManager,
   event: SubstrateEvent,
-  channelId: ChannelId,
+  channel: Channel,
   contentActor: typeof ContentActor,
   decodedMessage: ChannelOwnerRemarked
-): Promise<Partial<MetaprotocolTransactionSuccessful>> {
-  const messageType = decodedMessage.channelOwnerRemarked
-
-  if (messageType === 'pinOrUnpinComment') {
-    await processPinOrUnpinCommentMessage(store, event, channelId, decodedMessage.pinOrUnpinComment!)
+): Promise<MetaprotocolTransactionSuccessful | MetaprotocolTxError> {
+  const metaprotocolTransactionSuccessful = new MetaprotocolTransactionSuccessful()
+  if (decodedMessage.pinOrUnpinComment) {
+    const commentOrError = await processPinOrUnpinCommentMessage(
+      store,
+      event,
+      channel,
+      decodedMessage.pinOrUnpinComment!
+    )
 
-    return {}
+    if (commentOrError instanceof Comment) {
+      return metaprotocolTransactionSuccessful
+    }
+    return commentOrError
   }
 
-  if (messageType === 'banOrUnbanMemberFromChannel') {
-    await processBanOrUnbanMemberFromChannelMessage(
+  if (decodedMessage.banOrUnbanMemberFromChannel) {
+    const memberOrError = await processBanOrUnbanMemberFromChannelMessage(
       store,
       event,
-      channelId,
+      channel,
       decodedMessage.banOrUnbanMemberFromChannel!
     )
 
-    return {}
+    if (memberOrError instanceof Membership) {
+      return metaprotocolTransactionSuccessful
+    }
+    return memberOrError
   }
 
-  if (messageType === 'videoReactionsPreference') {
-    await processVideoReactionsPreferenceMessage(store, event, channelId, decodedMessage.videoReactionsPreference!)
+  if (decodedMessage.videoReactionsPreference) {
+    const channelOrError = await processVideoReactionsPreferenceMessage(
+      store,
+      event,
+      channel,
+      decodedMessage.videoReactionsPreference!
+    )
 
-    return {}
+    if (channelOrError instanceof Channel) {
+      return metaprotocolTransactionSuccessful
+    }
+    return channelOrError
   }
 
-  if (messageType === 'moderateComment') {
-    const comment = await processModerateCommentMessage(
+  if (decodedMessage.moderateComment) {
+    const commentOrError = await processModerateCommentMessage(
       store,
       event,
       contentActor,
-      channelId,
+      channel,
       decodedMessage.moderateComment!
     )
-    return { commentModeratedId: comment.id }
+
+    if (commentOrError instanceof Comment) {
+      return metaprotocolTransactionSuccessful
+    }
+    return commentOrError
   }
 
-  return inconsistentState('Unsupported message type in channel owner remark action', messageType)
+  return MetaprotocolTxError.InvalidMetadata
 }
 
 async function processModeratorRemark(
   store: DatabaseManager,
   event: SubstrateEvent,
-  channelId: ChannelId,
+  channel: Channel,
   contentActor: typeof ContentActor,
   decodedMessage: ChannelModeratorRemarked
-): Promise<Partial<MetaprotocolTransactionSuccessful>> {
-  const messageType = decodedMessage.channelModeratorRemarked
-
-  if (messageType === 'moderateComment') {
-    const comment = await processModerateCommentMessage(
+): Promise<MetaprotocolTransactionSuccessful | MetaprotocolTxError> {
+  const metaprotocolTransactionSuccessful = new MetaprotocolTransactionSuccessful()
+  if (decodedMessage.moderateComment) {
+    const commentOrError = await processModerateCommentMessage(
       store,
       event,
       contentActor,
-      channelId,
+      channel,
       decodedMessage.moderateComment!
     )
 
-    return { commentModeratedId: comment.id }
+    if (commentOrError instanceof Comment) {
+      return metaprotocolTransactionSuccessful
+    }
+    return commentOrError
   }
 
-  return inconsistentState('Unsupported message type in moderator remark action', messageType)
+  return MetaprotocolTxError.InvalidMetadata
 }
 
 export async function content_ChannelPayoutsUpdated({ store, event }: EventContext & StoreContext): Promise<void> {
@@ -517,12 +500,7 @@ export async function content_ChannelRewardUpdated({ store, event }: EventContex
   const [cumulativeRewardEarned, claimedAmount, channelId] = new ChannelRewardUpdatedEvent_V2001(event).params
 
   // load channel
-  const channel = await store.get(Channel, { where: { id: channelId.toString() } })
-
-  // ensure channel exists
-  if (!channel) {
-    return inconsistentState('Non-existing channel reward updated', channelId)
-  }
+  const channel = await getChannelOrFail(store, channelId.toString())
 
   // common event processing - second
 
@@ -549,12 +527,7 @@ export async function content_ChannelRewardClaimedAndWithdrawn({
   const [owner, channelId, withdrawnAmount, destination] = new ChannelRewardClaimedAndWithdrawnEvent_V1001(event).params
 
   // load channel
-  const channel = await store.get(Channel, { where: { id: channelId.toString() } })
-
-  // ensure channel exists
-  if (!channel) {
-    return inconsistentState('Non-existing channel reward updated', channelId)
-  }
+  const channel = await getChannelOrFail(store, channelId.toString())
 
   // common event processing - second
 
@@ -576,20 +549,13 @@ export async function content_ChannelRewardClaimedAndWithdrawn({
 }
 
 export async function content_ChannelFundsWithdrawn({ store, event }: EventContext & StoreContext): Promise<void> {
-  // load event data
   // load event data
   const [owner, channelId, amount, destination] = new ChannelFundsWithdrawnEvent_V1001(event).params
 
   // load channel
-  const channel = await store.get(Channel, { where: { id: channelId.toString() } })
-
-  // ensure channel exists
-  if (!channel) {
-    return inconsistentState('Non-existing channel reward updated', channelId)
-  }
+  const channel = await getChannelOrFail(store, channelId.toString())
 
   // common event processing - second
-
   const rewardClaimedEvent = new ChannelFundsWithdrawnEvent({
     ...genericEventFields(event),
 
@@ -605,27 +571,22 @@ export async function content_ChannelFundsWithdrawn({ store, event }: EventConte
 export async function processChannelPaymentFromMember(
   store: DatabaseManager,
   event: SubstrateEvent,
-  memberId: MemberId,
+  member: Membership,
   message: DecodedMetadataObject<IMakeChannelPayment>,
   [payeeAccount, amount]: [AccountId32, Balance]
-): Promise<ChannelPaymentMadeEvent> {
-  const member = await getMemberById(store, memberId)
-
+): Promise<ChannelPaymentMadeEvent | MetaprotocolTxError> {
   // Only channel reward accounts are being checked right now as payment destination.
   // Transfers to any other destination will be ignored by the query node.
-  const channel = await store.get(Channel, { where: { rewardAccount: payeeAccount.toString() } })
+  const channel = await getOneBy(store, Channel, { rewardAccount: payeeAccount.toString() })
   if (!channel) {
-    unexpectedData('Payment made to unknown channel reward account')
+    return MetaprotocolTxError.InvalidChannelRewardAccount
   }
 
   // Get payment context from the metadata
   const getPaymentContext = async (msg: DecodedMetadataObject<IMakeChannelPayment>) => {
     if (msg.videoId) {
       const paymentContext = new PaymentContextVideo()
-      const video = await store.get(Video, {
-        where: { id: msg.videoId.toString(), channel: { id: channel.id } },
-        relations: ['channel'],
-      })
+      const video = await getOneBy(store, Video, { id: msg.videoId, channel: { id: channel.id } }, ['channel'])
       if (!video) {
         invalidMetadata(
           `payment context video not found in channel that was queried based on reward (or payee) account.`
diff --git a/query-node/mappings/src/content/commentAndReaction.ts b/query-node/mappings/src/content/commentAndReaction.ts
index 01fefcdba2..31ac3bed92 100644
--- a/query-node/mappings/src/content/commentAndReaction.ts
+++ b/query-node/mappings/src/content/commentAndReaction.ts
@@ -15,7 +15,6 @@ import {
   VideoReactionsPreference,
 } from '@joystream/metadata-protobuf'
 import { DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
-import { ChannelId, MemberId } from '@joystream/types/primitives'
 import {
   Channel,
   Comment,
@@ -38,77 +37,30 @@ import {
   VideoReactionsCountByReactionType,
   VideoReactionsPreferenceEvent,
 } from 'query-node/dist/model'
-import { genericEventFields, inconsistentState, newMetaprotocolEntityId, unexpectedData } from '../common'
+import { MetaprotocolTxError, RelationsArr, genericEventFields, getById, newMetaprotocolEntityId } from '../common'
 
-// TODO: Ensure video is actually a video
-// TODO: make sure comment is fully removed (all of its reactions)
-// TODO: make sure video is fully removed (all of its comments & reactions)
-
-async function getChannel(store: DatabaseManager, channelId: string, relations?: string[]): Promise<Channel> {
-  const channel = await store.get(Channel, { where: { id: channelId }, relations })
-  if (!channel) {
-    inconsistentState(`Channel not found by id: ${channelId}`)
-  }
-  return channel
-}
-
-async function getVideo(store: DatabaseManager, videoId: string, relations?: string[]): Promise<Video> {
-  const video = await store.get(Video, { where: { id: videoId }, relations })
-  if (!video) {
-    inconsistentState(`Video not found by id: ${videoId}`)
-  }
-  return video
-}
-
-async function getComment(store: DatabaseManager, commentId: string, relations?: string[]): Promise<Comment> {
-  const comment = await store.get(Comment, { where: { id: commentId }, relations })
-  if (!comment) {
-    inconsistentState(`Video comment not found by id: ${commentId}`)
-  }
-  return comment
+async function getVideo(store: DatabaseManager, videoId: string, relations?: string[]): Promise<Video | undefined> {
+  return getById(store, Video, videoId, relations as RelationsArr<Video>)
 }
 
-function ensureMemberIsNotBannedFromChannel(channel: Channel, memberId: string, errorMessage: string) {
-  if (channel.bannedMembers.includes(new Membership({ id: memberId }))) {
-    inconsistentState(`${errorMessage}; member is banned from participating on content of channelId: `, channel.id)
-  }
-}
-
-function ensureReactionFeatureIsEnabled(video: Video) {
-  if (!video.isReactionFeatureEnabled) {
-    inconsistentState('Cannot add reaction; reaction feature is disabled on video: ', video.id)
-  }
-}
-
-function ensureCommentSectionIsEnabled(video: Video, errorMessage: string) {
-  if (!video.isCommentSectionEnabled) {
-    inconsistentState(`${errorMessage}; comment section is disabled on video: `, video.id)
-  }
-}
-
-function ensureCommentAuthor(comment: Comment, authorId: string, errorMessage: string) {
-  if (comment.author.id !== authorId) {
-    inconsistentState(errorMessage, comment.id)
-  }
+async function getComment(
+  store: DatabaseManager,
+  commentId: string,
+  relations?: string[]
+): Promise<Comment | undefined> {
+  return getById(store, Comment, commentId, relations as RelationsArr<Comment>)
 }
 
-function ensureCommentIsNotDeleted(comment: Comment) {
-  if (comment.status !== CommentStatus.VISIBLE) {
-    inconsistentState('Comment has been deleted', comment.id)
-  }
-}
-function ensureChannelOwnsTheVideo(video: Video, channelId: string, errorMessage: string) {
-  if (video.channel.id !== channelId) {
-    inconsistentState(`${errorMessage}; video does not belong to the channelId: `, channelId)
-  }
+function isMemberBannedFromChannel(channel: Channel, memberId: string) {
+  return channel.bannedMembers.some((bannedMember) => bannedMember.id === memberId)
 }
 
-function videoReactionEntityId(idSegments: { memberId: MemberId; videoId: string }) {
+function videoReactionEntityId(idSegments: { memberId: string; videoId: string }) {
   const { memberId, videoId } = idSegments
   return `${memberId}-${videoId}`
 }
 
-function commentReactionEntityId(idSegments: { memberId: MemberId; commentId: string; reactionId: number }) {
+function commentReactionEntityId(idSegments: { memberId: string; commentId: string; reactionId: number }) {
   const { memberId, commentId, reactionId } = idSegments
   return `${memberId}-${commentId}-${reactionId}`
 }
@@ -142,9 +94,11 @@ async function getOrCreateCommentReactionsCountByReactionId(
   comment: Comment,
   reactionId: number
 ): Promise<CommentReactionsCountByReactionId> {
-  const reactionsCountByReactionId = await store.get(CommentReactionsCountByReactionId, {
-    where: { id: `${comment.id}-${reactionId}` },
-  })
+  const reactionsCountByReactionId = await getById(
+    store,
+    CommentReactionsCountByReactionId,
+    `${comment.id}-${reactionId}`
+  )
 
   if (!reactionsCountByReactionId) {
     const newReactionsCountByReactionId = new CommentReactionsCountByReactionId({
@@ -192,9 +146,9 @@ function parseVideoReaction(reaction: ReactVideo.Reaction): VideoReactionOptions
 export async function processReactVideoMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
-  memberId: MemberId,
+  member: Membership,
   metadata: DecodedMetadataObject<IReactVideo>
-): Promise<void> {
+): Promise<Video | MetaprotocolTxError> {
   const { videoId, reaction } = metadata
   const reactionResult = parseVideoReaction(reaction)
 
@@ -235,17 +189,25 @@ export async function processReactVideoMessage(
   }
 
   // load video
-  const video = await getVideo(store, videoId.toString(), ['channel', 'channel.bannedMembers'])
+  const video = await getVideo(store, videoId, ['channel', 'channel.bannedMembers'])
+  if (!video) {
+    return MetaprotocolTxError.VideoNotFound
+  }
 
   // ensure member is not banned from channel
-  ensureMemberIsNotBannedFromChannel(video.channel, memberId.toString(), 'Cannot add reaction')
+  const isBanned = isMemberBannedFromChannel(video.channel, member.id)
+  if (isBanned) {
+    return MetaprotocolTxError.MemberBannedFromChannel
+  }
 
   // ensure reaction feature is enabled on the video
-  ensureReactionFeatureIsEnabled(video)
+  if (!video.isReactionFeatureEnabled) {
+    return MetaprotocolTxError.VideoReactionsDisabled
+  }
 
   // load previous reaction by member to the video (if any)
   const previousReactionByMember = await store.get(VideoReaction, {
-    where: { id: videoReactionEntityId({ memberId, videoId: videoId.toString() }) },
+    where: { id: videoReactionEntityId({ memberId: member.id, videoId }) },
   })
 
   // load video reaction count by reaction type (LIKE/UNLIKE)
@@ -256,11 +218,11 @@ export async function processReactVideoMessage(
   } else {
     // new reaction
     const newReactionByMember = new VideoReaction({
-      id: videoReactionEntityId({ memberId, videoId: videoId.toString() }),
+      id: videoReactionEntityId({ memberId: member.id, videoId }),
       video,
       reaction: reactionResult,
-      memberId: memberId.toString(),
-      member: new Membership({ id: memberId.toString() }),
+      memberId: member.id,
+      member,
     })
 
     setReactionsAndRepliesCount(event, video, reactionsCountByReactionType, 'INCREMENT')
@@ -280,32 +242,45 @@ export async function processReactVideoMessage(
     ...genericEventFields(event),
     video,
     videoChannel: video.channel,
-    reactingMember: new Membership({ id: memberId.toString() }),
+    reactingMember: member,
     reactionResult,
   })
 
   await store.save<VideoReactedEvent>(videoReactedEvent)
+
+  return video
 }
 
 export async function processReactCommentMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
-  memberId: MemberId,
+  member: Membership,
   metadata: DecodedMetadataObject<IReactComment>
-): Promise<void> {
+): Promise<Comment | MetaprotocolTxError> {
   const { commentId, reactionId } = metadata
 
   // load comment
   const comment = await getComment(store, commentId, ['video', 'video.channel', 'video.channel.bannedMembers'])
+
+  // ensure comment exists & is not deleted or moderated
+  if (!comment || comment.status !== CommentStatus.VISIBLE) {
+    return MetaprotocolTxError.CommentNotFound
+  }
+
   const { video } = comment
 
   // ensure member is not banned from channel
-  ensureMemberIsNotBannedFromChannel(video.channel, memberId.toString(), 'Cannot add reaction')
+  const isBanned = isMemberBannedFromChannel(video.channel, member.id)
+  if (isBanned) {
+    return MetaprotocolTxError.MemberBannedFromChannel
+  }
 
   // load same reaction by member to the comment (if any)
-  const previousReactionByMember = await store.get(CommentReaction, {
-    where: { id: commentReactionEntityId({ memberId, commentId, reactionId }) },
-  })
+  const previousReactionByMember = await getById(
+    store,
+    CommentReaction,
+    commentReactionEntityId({ memberId: member.id, commentId, reactionId })
+  )
 
   // load video reaction count by reaction id
   const reactionsCountByReactionId = await getOrCreateCommentReactionsCountByReactionId(store, comment, reactionId)
@@ -319,12 +294,12 @@ export async function processReactCommentMessage(
   } else {
     // new reaction
     const newReactionByMember = new CommentReaction({
-      id: commentReactionEntityId({ memberId, commentId, reactionId }),
+      id: commentReactionEntityId({ memberId: member.id, commentId, reactionId }),
       comment,
       reactionId,
       video,
-      memberId: memberId.toString(),
-      member: new Membership({ id: memberId.toString() }),
+      memberId: member.id,
+      member,
     })
 
     // increment reactions count
@@ -346,30 +321,41 @@ export async function processReactCommentMessage(
     comment,
     video,
     videoChannel: video.channel,
-    reactingMember: new Membership({ id: memberId.toString() }),
+    reactingMember: member,
     reactionResult: reactionId,
   })
 
   await store.save<CommentReactedEvent>(commentReactedEvent)
+
+  return comment
 }
 
 export async function processCreateCommentMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
-  memberId: MemberId,
+  member: Membership,
   metadata: DecodedMetadataObject<ICreateComment>
-): Promise<Comment> {
+): Promise<Comment | MetaprotocolTxError> {
   const { videoId, parentCommentId, body } = metadata
 
   // load video
-  const video = await getVideo(store, videoId.toString(), ['channel', 'channel.bannedMembers'])
+  const video = await getVideo(store, videoId, ['channel', 'channel.bannedMembers'])
+  if (!video) {
+    return MetaprotocolTxError.VideoNotFound
+  }
+
   const { channel } = video
 
   // ensure member is not banned from channel
-  ensureMemberIsNotBannedFromChannel(channel, memberId.toString(), 'Cannot add comment')
+  const isBanned = isMemberBannedFromChannel(channel, member.id)
+  if (isBanned) {
+    return MetaprotocolTxError.MemberBannedFromChannel
+  }
 
   // ensure video's comment section is enabled
-  ensureCommentSectionIsEnabled(video, 'Cannot add comment')
+  if (!video.isCommentSectionEnabled) {
+    return MetaprotocolTxError.CommentSectionDisabled
+  }
 
   // if new comment is replying to some parent comment, 1. validate that comment existence,
   //  2. set `parentComment` to the parent comment, otherwise set `parentComment` to undefined
@@ -378,7 +364,7 @@ export async function processCreateCommentMessage(
     : undefined
 
   if (parentComment && parentComment.video.id !== videoId.toString()) {
-    inconsistentState(`Cannot add comment. parent comment ${parentComment.id} does not exist on video ${videoId}`)
+    return MetaprotocolTxError.ParentCommentNotFound
   }
 
   // increment video's comment count
@@ -397,7 +383,7 @@ export async function processCreateCommentMessage(
     text: body,
     video,
     status: CommentStatus.VISIBLE,
-    author: new Membership({ id: memberId.toString() }),
+    author: member,
     parentComment,
     repliesCount: 0,
     reactionsCount: 0,
@@ -425,9 +411,9 @@ export async function processCreateCommentMessage(
 export async function processEditCommentMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
-  memberId: MemberId,
+  member: Membership,
   metadata: DecodedMetadataObject<IEditComment>
-): Promise<Comment> {
+): Promise<Comment | MetaprotocolTxError> {
   const { commentId, newBody } = metadata
 
   // load comment
@@ -438,19 +424,29 @@ export async function processEditCommentMessage(
     'video.channel',
     'video.channel.bannedMembers',
   ])
+
+  // ensure comment exists & is not deleted or moderated
+  if (!comment || comment.status !== CommentStatus.VISIBLE) {
+    return MetaprotocolTxError.CommentNotFound
+  }
+
   const { video } = comment
 
   // ensure member is not banned from channel
-  ensureMemberIsNotBannedFromChannel(video.channel, memberId.toString(), 'Cannot edit reaction')
+  const isBanned = isMemberBannedFromChannel(video.channel, member.id)
+  if (isBanned) {
+    return MetaprotocolTxError.MemberBannedFromChannel
+  }
 
   // ensure video's comment section is enabled
-  ensureCommentSectionIsEnabled(video, 'Cannot edit reaction')
+  if (!video.isCommentSectionEnabled) {
+    return MetaprotocolTxError.CommentSectionDisabled
+  }
 
   // ensure comment is being edited by author
-  ensureCommentAuthor(comment, memberId.toString(), 'Only comment author can update the comment')
-
-  // ensure comment is not deleted or moderated
-  ensureCommentIsNotDeleted(comment)
+  if (comment.author.id !== member.id) {
+    return MetaprotocolTxError.InvalidCommentAuthor
+  }
 
   // common event processing
 
@@ -475,9 +471,9 @@ export async function processEditCommentMessage(
 export async function processDeleteCommentMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
-  memberId: MemberId,
+  member: Membership,
   metadata: DecodedMetadataObject<IDeleteComment>
-): Promise<Comment> {
+): Promise<Comment | MetaprotocolTxError> {
   const { commentId } = metadata
 
   // load comment
@@ -488,19 +484,29 @@ export async function processDeleteCommentMessage(
     'video.channel',
     'video.channel.bannedMembers',
   ])
+
+  // ensure comment exists & is not deleted or moderated
+  if (!comment || comment.status !== CommentStatus.VISIBLE) {
+    return MetaprotocolTxError.CommentNotFound
+  }
+
   const { video, parentComment } = comment
 
   // ensure member is not banned from channel
-  ensureMemberIsNotBannedFromChannel(video.channel, memberId.toString(), 'Cannot delete comment')
+  const isBanned = isMemberBannedFromChannel(video.channel, member.id)
+  if (isBanned) {
+    return MetaprotocolTxError.MemberBannedFromChannel
+  }
 
   // ensure video's comment section is enabled
-  ensureCommentSectionIsEnabled(video, 'Cannot delete comment')
+  if (!video.isCommentSectionEnabled) {
+    return MetaprotocolTxError.CommentSectionDisabled
+  }
 
   // ensure comment is being deleted by author
-  ensureCommentAuthor(comment, memberId.toString(), 'Only comment author can delete the comment')
-
-  // ensure comment is not already deleted or moderated
-  ensureCommentIsNotDeleted(comment)
+  if (comment.author.id !== member.id) {
+    return MetaprotocolTxError.InvalidCommentAuthor
+  }
 
   // decrement video's comment count
   --video.commentsCount
@@ -537,21 +543,26 @@ export async function processDeleteCommentMessage(
 export async function processModerateCommentMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
-  channelOwnerOrModerator: typeof ContentActor,
-  channelId: ChannelId,
+  channelOwnerOrCurator: typeof ContentActor,
+  channel: Channel,
   message: IModerateComment
-): Promise<Comment> {
+): Promise<Comment | MetaprotocolTxError> {
   const { commentId, rationale } = message
 
   // load comment
   const comment = await getComment(store, commentId, ['parentComment', 'video', 'video.channel'])
+
+  // ensure comment exists & is not deleted or moderated
+  if (!comment || comment.status !== CommentStatus.VISIBLE) {
+    return MetaprotocolTxError.CommentNotFound
+  }
+
   const { video, parentComment } = comment
 
   // ensure channel owns the video
-  ensureChannelOwnsTheVideo(video, channelId.toString(), 'Cannot moderate comment on video')
-
-  // ensure comment is not already deleted or moderated
-  ensureCommentIsNotDeleted(comment)
+  if (video.channel.id !== channel.id) {
+    return MetaprotocolTxError.VideoNotFoundInChannel
+  }
 
   // decrement video's comment count
   --video.commentsCount
@@ -578,7 +589,7 @@ export async function processModerateCommentMessage(
     comment,
     video,
     videoChannel: video.channel,
-    actor: channelOwnerOrModerator,
+    actor: channelOwnerOrCurator,
     rationale,
   })
   await store.save<CommentModeratedEvent>(commentModeratedEvent)
@@ -594,20 +605,25 @@ export async function processModerateCommentMessage(
 export async function processPinOrUnpinCommentMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
-  channelId: ChannelId,
+  channel: Channel,
   message: IPinOrUnpinComment
-): Promise<void> {
+): Promise<Comment | MetaprotocolTxError> {
   const { commentId, option } = message
 
   // load comment
   const comment = await getComment(store, commentId, ['video', 'video.channel'])
+
+  // ensure comment exists & is not deleted or moderated
+  if (!comment || comment.status !== CommentStatus.VISIBLE) {
+    return MetaprotocolTxError.CommentNotFound
+  }
+
   const { video } = comment
 
   // ensure channel owns the video
-  ensureChannelOwnsTheVideo(video, channelId.toString(), 'Cannot pin/unpin comment on video')
-
-  // ensure comment is not deleted or moderated
-  ensureCommentIsNotDeleted(comment)
+  if (video.channel.id !== channel.id) {
+    return MetaprotocolTxError.VideoNotFoundInChannel
+  }
 
   video.pinnedComment = option === PinOrUnpinComment.Option.PIN ? comment : undefined
   await store.save<Video>(video)
@@ -623,65 +639,70 @@ export async function processPinOrUnpinCommentMessage(
   })
 
   await store.save<CommentPinnedEvent>(commentPinnedEvent)
+
+  return comment
 }
 
 export async function processBanOrUnbanMemberFromChannelMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
-  channelId: ChannelId,
+  channel: Channel,
   message: IBanOrUnbanMemberFromChannel
-): Promise<void> {
+): Promise<Membership | MetaprotocolTxError> {
   const { memberId, option } = message
 
-  // load channel
-  const channel = await getChannel(store, channelId.toString(), ['bannedMembers'])
-
-  const member = await store.get(Membership, { where: { id: memberId.toString() } })
+  const member = await getById(store, Membership, memberId.toString(), ['memberBannedFromChannels'])
   if (!member) {
-    // Error will be caught inside `content_ChannelOwnerRemarked`
-    unexpectedData(`Member by id '${memberId.toString()}' not found!`)
+    return MetaprotocolTxError.MemberNotFound
   }
 
   // ban member from channel; if member is already banned it remains banned
   if (option === BanOrUnbanMemberFromChannel.Option.BAN) {
-    channel.bannedMembers.push(new Membership({ id: memberId.toString() }))
+    member.memberBannedFromChannels.push(channel)
   }
 
   // unban member from channel; if member is already unbanned it remains banned
   if (option === BanOrUnbanMemberFromChannel.Option.UNBAN) {
-    const updatedBannedMemberList = channel.bannedMembers.filter(
-      (member) => member !== new Membership({ id: memberId.toString() })
+    const updatedBannedFromChannelsList = member.memberBannedFromChannels.filter(
+      (bannedFromChannel) => bannedFromChannel.id !== channel.id
     )
-    channel.bannedMembers = updatedBannedMemberList
+    member.memberBannedFromChannels = updatedBannedFromChannelsList
   }
 
-  await store.save<Channel>(channel)
+  await store.save<Membership>(member)
 
   // common event processing
 
   const memberBannedFromChannelEvent = new MemberBannedFromChannelEvent({
     ...genericEventFields(event),
     channel,
-    member: new Membership({ id: memberId.toString() }),
+    member,
     action: option === BanOrUnbanMemberFromChannel.Option.BAN,
   })
 
   await store.save<MemberBannedFromChannelEvent>(memberBannedFromChannelEvent)
+
+  return member
 }
 
 export async function processVideoReactionsPreferenceMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
-  channelId: ChannelId,
+  channel: Channel,
   message: IVideoReactionsPreference
-): Promise<void> {
+): Promise<Channel | MetaprotocolTxError> {
   const { videoId, option } = message
 
   // load video
   const video = await getVideo(store, videoId.toString(), ['channel'])
+  if (!video) {
+    return MetaprotocolTxError.VideoNotFound
+  }
 
   // ensure channel owns the video
-  ensureChannelOwnsTheVideo(video, channelId.toString(), 'Cannot change video reactions preference')
+  if (video.channel.id !== channel.id) {
+    return MetaprotocolTxError.VideoNotFoundInChannel
+  }
 
   video.isCommentSectionEnabled = option === VideoReactionsPreference.Option.ENABLE
   await store.save<Video>(video)
@@ -695,4 +716,6 @@ export async function processVideoReactionsPreferenceMessage(
   })
 
   await store.save<VideoReactionsPreferenceEvent>(videoReactionsPreferenceEvent)
+
+  return video.channel
 }
diff --git a/query-node/mappings/src/content/curatorGroup.ts b/query-node/mappings/src/content/curatorGroup.ts
index 7870eadd2c..99db9ccf64 100644
--- a/query-node/mappings/src/content/curatorGroup.ts
+++ b/query-node/mappings/src/content/curatorGroup.ts
@@ -2,10 +2,10 @@
 eslint-disable @typescript-eslint/naming-convention
 */
 import { DatabaseManager, EventContext, StoreContext } from '@joystream/hydra-common'
-import { Curator, CuratorGroup, CuratorAgentPermissions } from 'query-node/dist/model'
-import { inconsistentState, logger } from '../common'
-import { mapAgentPermission } from './utils'
 import { BTreeSet } from '@polkadot/types'
+import { Curator, CuratorAgentPermissions, CuratorGroup } from 'query-node/dist/model'
+import { getById, getByIdOrFail, logger } from '../common'
+import { mapAgentPermission } from './utils'
 // Joystream types
 import { PalletContentIterableEnumsChannelActionPermission } from '@polkadot/types/lookup'
 import {
@@ -15,14 +15,6 @@ import {
   Content_CuratorRemovedEvent_V1001 as CuratorRemovedEvent_V1001,
 } from '../../generated/types'
 
-async function getCurator(store: DatabaseManager, curatorId: string): Promise<Curator | undefined> {
-  const existingCurator = await store.get(Curator, {
-    where: { id: curatorId.toString() },
-  })
-
-  return existingCurator
-}
-
 async function createCurator(store: DatabaseManager, curatorId: string): Promise<Curator> {
   const curator = new Curator({
     id: curatorId,
@@ -36,7 +28,7 @@ async function createCurator(store: DatabaseManager, curatorId: string): Promise
 }
 
 async function ensureCurator(store: DatabaseManager, curatorId: string): Promise<Curator> {
-  return (await getCurator(store, curatorId)) || (await createCurator(store, curatorId))
+  return (await getById(store, Curator, curatorId)) || (await createCurator(store, curatorId))
 }
 
 export async function content_CuratorGroupCreated({ store, event }: EventContext & StoreContext): Promise<void> {
@@ -63,14 +55,7 @@ export async function content_CuratorGroupStatusSet({ store, event }: EventConte
   const [curatorGroupId, isActive] = new CuratorGroupStatusSetEvent_V1001(event).params
 
   // load curator group
-  const curatorGroup = await store.get(CuratorGroup, {
-    where: { id: curatorGroupId.toString() },
-  })
-
-  // ensure curator group exists
-  if (!curatorGroup) {
-    return inconsistentState('Non-existing curator group status set requested', curatorGroupId)
-  }
+  const curatorGroup = await getByIdOrFail(store, CuratorGroup, curatorGroupId.toString())
 
   // update curator group
   curatorGroup.isActive = isActive.isTrue
@@ -87,15 +72,7 @@ export async function content_CuratorAdded({ store, event }: EventContext & Stor
   const [curatorGroupId, curatorId, permissions] = new CuratorAddedEvent_V1001(event).params
 
   // load curator group
-  const curatorGroup = await store.get(CuratorGroup, {
-    where: { id: curatorGroupId.toString() },
-    relations: ['curators'],
-  })
-
-  // ensure curator group exists
-  if (!curatorGroup) {
-    return inconsistentState('Curator add to non-existing curator group requested', curatorGroupId)
-  }
+  const curatorGroup = await getByIdOrFail(store, CuratorGroup, curatorGroupId.toString(), ['curators'])
 
   // load curator
   const curator = await ensureCurator(store, curatorId.toString())
@@ -115,15 +92,7 @@ export async function content_CuratorRemoved({ store, event }: EventContext & St
   const [curatorGroupId, curatorId] = new CuratorRemovedEvent_V1001(event).params
 
   // load curator group
-  const curatorGroup = await store.get(CuratorGroup, {
-    where: { id: curatorGroupId.toString() },
-    relations: ['curators'],
-  })
-
-  // ensure curator group exists
-  if (!curatorGroup) {
-    return inconsistentState('Non-existing curator group removal requested', curatorGroupId)
-  }
+  const curatorGroup = await getByIdOrFail(store, CuratorGroup, curatorGroupId.toString(), ['curators'])
 
   // load curator
   const curator = await ensureCurator(store, curatorId.toString())
diff --git a/query-node/mappings/src/content/nft.ts b/query-node/mappings/src/content/nft.ts
index cf69d50c07..19807b9325 100644
--- a/query-node/mappings/src/content/nft.ts
+++ b/query-node/mappings/src/content/nft.ts
@@ -1,48 +1,48 @@
 // TODO: solve events' relations to videos and other entites that can be changed or deleted
 
-import { DatabaseManager, EventContext, StoreContext, SubstrateEvent, FindOneOptions } from '@joystream/hydra-common'
-import { genericEventFields, inconsistentState, logger, EntityType } from '../common'
+import { DatabaseManager, EventContext, StoreContext, SubstrateEvent } from '@joystream/hydra-common'
+import {
+  PalletContentNftTypesEnglishAuctionParamsRecord as EnglishAuctionParams,
+  PalletContentNftTypesInitTransactionalStatusRecord as InitTransactionalStatus,
+  PalletContentNftTypesNftIssuanceParametersRecord as NftIssuanceParameters,
+  PalletContentNftTypesOpenAuctionParamsRecord as OpenAuctionParams,
+} from '@polkadot/types/lookup'
+import BN from 'bn.js'
+import _ from 'lodash'
 import {
   // entities
   Auction,
+  AuctionBidCanceledEvent,
+  AuctionBidMadeEvent,
+  AuctionCanceledEvent,
   AuctionType,
   AuctionTypeEnglish,
   AuctionTypeOpen,
   Bid,
+  BidMadeCompletingAuctionEvent,
+  BuyNowCanceledEvent,
+  BuyNowPriceUpdatedEvent,
+  EnglishAuctionSettledEvent,
+  EnglishAuctionStartedEvent,
   Membership,
+  NftBoughtEvent,
+  NftIssuedEvent,
+  NftSellOrderMadeEvent,
+  NftSlingedBackToTheOriginalArtistEvent,
+  OfferAcceptedEvent,
+  OfferCanceledEvent,
+  OfferStartedEvent,
+  OpenAuctionBidAcceptedEvent,
+  // events
+  OpenAuctionStartedEvent,
   OwnedNft,
-  Video,
   TransactionalStatus,
-  TransactionalStatusInitiatedOfferToMember,
-  TransactionalStatusIdle,
   TransactionalStatusBuyNow,
+  TransactionalStatusIdle,
+  TransactionalStatusInitiatedOfferToMember,
   TransactionalStatusUpdate,
-
-  // events
-  OpenAuctionStartedEvent,
-  EnglishAuctionStartedEvent,
-  NftIssuedEvent,
-  AuctionBidMadeEvent,
-  AuctionBidCanceledEvent,
-  AuctionCanceledEvent,
-  EnglishAuctionSettledEvent,
-  BidMadeCompletingAuctionEvent,
-  OpenAuctionBidAcceptedEvent,
-  OfferStartedEvent,
-  OfferAcceptedEvent,
-  OfferCanceledEvent,
-  NftSellOrderMadeEvent,
-  NftBoughtEvent,
-  BuyNowCanceledEvent,
-  BuyNowPriceUpdatedEvent,
-  NftSlingedBackToTheOriginalArtistEvent,
+  Video,
 } from 'query-node/dist/model'
-import {
-  PalletContentNftTypesNftIssuanceParametersRecord as NftIssuanceParameters,
-  PalletContentNftTypesOpenAuctionParamsRecord as OpenAuctionParams,
-  PalletContentNftTypesEnglishAuctionParamsRecord as EnglishAuctionParams,
-  PalletContentNftTypesInitTransactionalStatusRecord as InitTransactionalStatus,
-} from '@polkadot/types/lookup'
 import {
   Content_AuctionBidCanceledEvent_V1001 as AuctionBidCanceledEvent_V1001,
   Content_AuctionBidMadeEvent_V1001 as AuctionBidMadeEvent_V1001,
@@ -62,68 +62,38 @@ import {
   Content_OpenAuctionBidAcceptedEvent_V1001 as OpenAuctionBidAcceptedEvent_V1001,
   Content_OpenAuctionStartedEvent_V1001 as OpenAuctionStartedEvent_V1001,
 } from '../../generated/types'
-import { In } from 'typeorm'
-import BN from 'bn.js'
-import { PERBILL_ONE_PERCENT } from '../temporaryConstants'
+import {
+  RelationsArr,
+  genericEventFields,
+  getById,
+  getByIdOrFail,
+  getManyBy,
+  getOneByOrFail,
+  inconsistentState,
+  unimplementedError,
+} from '../common'
 import { getAllManagers } from '../derivedPropertiesManager/applications'
-import { convertContentActorToChannelOrNftOwner, convertContentActor } from './utils'
-import _ from 'lodash'
-
-async function getExistingEntity<Type extends Video | Membership>(
-  store: DatabaseManager,
-  entityType: EntityType<Type>,
-  id: string,
-  relations: string[] = []
-): Promise<Type | undefined> {
-  // load entity
-  const entity = await store.get(entityType, { where: { id }, relations } as FindOneOptions<Type>)
-
-  return entity
-}
-
-async function getRequiredExistingEntity<Type extends Video | Membership>(
-  store: DatabaseManager,
-  entityType: EntityType<Type>,
-  id: string,
-  errorMessage: string,
-  relations: string[] = []
-): Promise<Type> {
-  const entity = await getExistingEntity(store, entityType, id, relations)
-
-  // ensure video exists
-  if (!entity) {
-    return inconsistentState(errorMessage, id)
-  }
-
-  return entity
-}
+import { PERBILL_ONE_PERCENT } from '../temporaryConstants'
+import { convertContentActor, convertContentActorToChannelOrNftOwner } from './utils'
 
 async function getCurrentAuctionFromVideo(
   store: DatabaseManager,
   videoId: string,
-  errorMessageForVideo: string,
-  errorMessageForNft: string,
-  errorMessageForAuction: string,
   nftRelations: string[] = [],
-  auctionRelations: string[] = []
+  auctionRelations: string[] = [],
+  errorMessageForAuction = 'Auction not found'
 ): Promise<{ video: Video; auction: Auction; nft: OwnedNft }> {
-  // load video
-  const video = await getRequiredExistingEntity(store, Video, videoId.toString(), errorMessageForVideo, [
-    'nft',
-    'nft.transactionalStatusAuction',
-    ...nftRelations.map((item) => `nft.${item}`),
-    'nft.auctions',
-    ...auctionRelations.map((item) => `nft.auctions.${item}`),
-  ])
-
-  const nft = video.nft
-
-  if (!nft) {
-    return inconsistentState(errorMessageForNft, videoId)
-  }
+  // load nft
+  const nft = await getByIdOrFail(store, OwnedNft, videoId.toString(), [
+    'video',
+    'transactionalStatusAuction',
+    'auctions',
+    ...nftRelations,
+    ...auctionRelations.map((item) => `auctions.${item}`),
+  ] as RelationsArr<OwnedNft>)
 
   // get auction
-  const allAuctions = video.nft?.auctions || []
+  const allAuctions = nft?.auctions || []
   const auction = allAuctions.length
     ? allAuctions.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime())[allAuctions.length - 1]
     : null
@@ -134,42 +104,12 @@ async function getCurrentAuctionFromVideo(
   }
 
   return {
-    video,
+    video: nft.video,
     auction,
     nft,
   }
 }
 
-async function getNftFromVideo(
-  store: DatabaseManager,
-  videoId: string,
-  errorMessageForVideo: string,
-  errorMessageForNft: string,
-  relations?: string[]
-): Promise<{ video: Video; nft: OwnedNft }> {
-  // load video
-  const video = await getRequiredExistingEntity(
-    store,
-    Video,
-    videoId.toString(),
-    errorMessageForVideo,
-    relations ? relations.concat(['nft']) : ['nft']
-  )
-
-  // get nft
-  const nft = video.nft
-
-  // ensure nft exists
-  if (!nft) {
-    return inconsistentState(errorMessageForNft, videoId)
-  }
-
-  return {
-    video,
-    nft,
-  }
-}
-
 async function resetNftTransactionalStatusFromVideo(
   store: DatabaseManager,
   videoId: string,
@@ -178,15 +118,7 @@ async function resetNftTransactionalStatusFromVideo(
   newOwner?: Membership
 ) {
   // load NFT
-  const nft = await store.get(OwnedNft, {
-    where: { id: videoId.toString() },
-    relations: ['ownerMember', 'ownerCuratorGroup', 'creatorChannel'],
-  })
-
-  // ensure NFT
-  if (!nft) {
-    return inconsistentState(errorMessage, videoId.toString())
-  }
+  const nft = await getByIdOrFail(store, OwnedNft, videoId, ['ownerMember', 'ownerCuratorGroup', 'creatorChannel'])
 
   if (newOwner) {
     nft.ownerMember = newOwner
@@ -201,32 +133,6 @@ async function resetNftTransactionalStatusFromVideo(
   return { nft }
 }
 
-async function getRequiredExistingEntites<Type extends Video | Membership>(
-  store: DatabaseManager,
-  entityType: EntityType<Type>,
-  ids: string[],
-  errorMessage: string,
-  throwOnMissingEntities = true
-): Promise<Type[]> {
-  // load entities
-  const entities = await store.getMany(entityType, { where: { id: In(ids) } } as FindOneOptions<Type>)
-
-  // assess loaded entity ids
-  const loadedEntityIds = entities.map((item) => item.id.toString())
-
-  // ensure all entities exists
-  if (throwOnMissingEntities && loadedEntityIds.length !== ids.length) {
-    const missingIds = ids.filter((item) => !loadedEntityIds.includes(item))
-
-    return inconsistentState(errorMessage, missingIds)
-  }
-
-  // ensure entities are ordered as requested
-  entities.sort((a, b) => ids.indexOf(a.id.toString()) - ids.indexOf(b.id.toString()))
-
-  return entities
-}
-
 async function setNewNftTransactionalStatus(
   store: DatabaseManager,
   nft: OwnedNft,
@@ -282,7 +188,7 @@ async function finishAuction(
 ) {
   function findOpenAuctionWinningBid(bids: Bid[], bidAmount: BN, winnerId: number, videoId: number): Bid {
     const winningBid = bids.find(
-      (bid) => !bid.isCanceled && bid.bidder.id.toString() === winnerId.toString() && bid.amount.eq(bidAmount)
+      (bid) => !bid.isCanceled && bid.bidder.id === winnerId.toString() && bid.amount.eq(bidAmount)
     )
 
     if (!winningBid) {
@@ -300,11 +206,9 @@ async function finishAuction(
   } = await getCurrentAuctionFromVideo(
     store,
     videoId.toString(),
-    `Non-existing video's auction was completed`,
-    `Non-existing NFT's auction was completed`,
-    'Non-existing auction was completed',
     ['ownerMember', 'ownerCuratorGroup'],
-    ['topBid', 'topBid.bidder', 'bids', 'bids.bidder']
+    ['topBid', 'topBid.bidder', 'bids', 'bids.bidder'],
+    'Non-existing auction was completed'
   )
 
   const winningBid = openAuctionWinner
@@ -348,22 +252,15 @@ async function createBid(
   previousTopBid?: Bid
 }> {
   // load member
-  const member = await getRequiredExistingEntity(
-    store,
-    Membership,
-    memberId.toString(),
-    'Non-existing member bid in auction'
-  )
+  const member = await getByIdOrFail(store, Membership, memberId.toString())
 
   // load video and auction
   const { video, auction, nft } = await getCurrentAuctionFromVideo(
     store,
     videoId.toString(),
-    'Non-existing video got bid',
-    'Non-existing NFT got bid',
-    'Non-existing auction got bid canceled',
     ['ownerMember', 'ownerCuratorGroup'],
-    ['topBid', 'bids', 'bids.bidder']
+    ['topBid', 'bids', 'bids.bidder'],
+    'Non-existing auction got bid canceled'
   )
 
   const memberPreviousUncanceledBids = await store.getMany(Bid, {
@@ -435,7 +332,7 @@ export async function createNft(
 ): Promise<OwnedNft> {
   // load owner
   const ownerMember = nftIssuanceParameters.nonChannelOwner.isSome
-    ? await getExistingEntity(store, Membership, nftIssuanceParameters.nonChannelOwner.unwrap().toString())
+    ? await getById(store, Membership, nftIssuanceParameters.nonChannelOwner.unwrap().toString())
     : video.channel.ownerMember
 
   // calculate some values
@@ -512,12 +409,10 @@ async function createAuction(
   auctionParams: OpenAuctionParams | EnglishAuctionParams,
   startsAtBlockNumber: number
 ): Promise<Auction> {
-  const whitelistedMembers = await getRequiredExistingEntites(
+  const whitelistedMembers = await getManyBy(
     store,
     Membership,
-    Array.from(auctionParams.whitelist.values()).map((item) => item.toString()),
-    'Non-existing members whitelisted',
-    false // this allows nonexisting members to be whitelisted (runtime allows that)
+    [...auctionParams.whitelist].map((id) => id.toString())
   )
 
   // prepare auction record
@@ -578,8 +473,7 @@ export async function convertTransactionalStatus(
     return status
   }
 
-  logger.error('Not implemented TransactionalStatus type', { contentActor: transactionalStatus.toString() })
-  throw new Error('Not-implemented TransactionalStatus type used')
+  unimplementedError(`Unsupported NFT TransactionalStatus type: ${transactionalStatus.toString()}`)
 }
 
 export async function contentNft_OpenAuctionStarted({ event, store }: EventContext & StoreContext): Promise<void> {
@@ -590,20 +484,12 @@ export async function contentNft_OpenAuctionStarted({ event, store }: EventConte
   // specific event processing
 
   // load video
-  const video = await getRequiredExistingEntity(
-    store,
-    Video,
-    videoId.toString(),
-    `Non-existing video's auction started`,
-    ['nft', 'nft.ownerMember', 'nft.ownerCuratorGroup', 'nft.creatorChannel']
-  )
-
-  // ensure NFT has been issued
-  if (!video.nft) {
-    return inconsistentState('Non-existing NFT auctioned', video.id.toString())
-  }
-
-  const nft = video.nft
+  const nft = await getByIdOrFail(store, OwnedNft, videoId.toString(), [
+    'video',
+    'ownerMember',
+    'ownerCuratorGroup',
+    'creatorChannel',
+  ])
 
   // create auction
   const auctionStart = auctionParams.startsAt.isSome ? auctionParams.startsAt.unwrap().toNumber() : event.blockNumber
@@ -617,7 +503,7 @@ export async function contentNft_OpenAuctionStarted({ event, store }: EventConte
     ...genericEventFields(event),
 
     actor: await convertContentActor(store, contentActor),
-    video,
+    video: nft.video,
     auction,
     // prepare Nft owner (handles fields `ownerMember` and `ownerCuratorGroup`)
     ...(await convertContentActorToChannelOrNftOwner(store, contentActor)),
@@ -634,20 +520,12 @@ export async function contentNft_EnglishAuctionStarted({ event, store }: EventCo
   // specific event processing
 
   // load video
-  const video = await getRequiredExistingEntity(
-    store,
-    Video,
-    videoId.toString(),
-    `Non-existing video's auction started`,
-    ['nft', 'nft.ownerMember', 'nft.ownerCuratorGroup', 'nft.creatorChannel']
-  )
-
-  // ensure NFT has been issued
-  if (!video.nft) {
-    return inconsistentState('Non-existing NFT auctioned', video.id.toString())
-  }
-
-  const nft = video.nft
+  const nft = await getByIdOrFail(store, OwnedNft, videoId.toString(), [
+    'video',
+    'ownerMember',
+    'ownerCuratorGroup',
+    'creatorChannel',
+  ])
 
   // create new auction
   const auctionStart = auctionParams.startsAt.isSome ? auctionParams.startsAt.unwrap().toNumber() : event.blockNumber
@@ -661,7 +539,7 @@ export async function contentNft_EnglishAuctionStarted({ event, store }: EventCo
     ...genericEventFields(event),
 
     actor: await convertContentActor(store, contentActor),
-    video,
+    video: nft.video,
     auction,
     // prepare Nft owner (handles fields `ownerMember` and `ownerCuratorGroup`)
     ...(await convertContentActorToChannelOrNftOwner(store, contentActor)),
@@ -707,11 +585,11 @@ export async function contentNft_NftIssued({ event, store }: EventContext & Stor
   // specific event processing
 
   // load video
-  const video = await getRequiredExistingEntity(store, Video, videoId.toString(), 'NFT for non-existing video issed', [
+  const video = await getByIdOrFail(store, Video, videoId.toString(), [
     'channel',
     'channel.ownerCuratorGroup',
     'channel.ownerMember',
-  ])
+  ] as RelationsArr<Video>)
 
   // prepare and save nft record
   const nft = await createNft(store, video, nftIssuanceParameters, event.blockNumber)
@@ -787,9 +665,11 @@ export async function contentNft_AuctionBidCanceled({ event, store }: EventConte
 
   // specific event processing
 
-  const canceledBid = await store.get(Bid, {
-    where: { bidder: { id: memberId.toString() }, nft: { id: videoId.toString() }, isCanceled: false },
-    relations: [
+  const canceledBid = await getOneByOrFail(
+    store,
+    Bid,
+    { bidder: { id: memberId.toString() }, nft: { id: videoId.toString() }, isCanceled: false },
+    [
       'nft',
       'nft.video',
       'nft.ownerMember',
@@ -798,13 +678,8 @@ export async function contentNft_AuctionBidCanceled({ event, store }: EventConte
       'auction.topBid',
       'auction.bids',
       'auction.bids.bidder',
-    ],
-  })
-
-  // ensure bid exists
-  if (!canceledBid) {
-    return inconsistentState('Non-existing bid got canceled')
-  }
+    ] as RelationsArr<Bid>
+  )
 
   // load auction and video
   const {
@@ -852,13 +727,7 @@ export async function contentNft_AuctionCanceled({ event, store }: EventContext
   // specific event processing
 
   // load video and auction
-  const { video, auction } = await getCurrentAuctionFromVideo(
-    store,
-    videoId.toString(),
-    'Non-existing video got bid canceled',
-    'Non-existing NFT got bid canceled',
-    'Non-existing auction got bid canceled'
-  )
+  const { video, auction } = await getCurrentAuctionFromVideo(store, videoId.toString())
 
   // update NFT's transactional status
   await resetNftTransactionalStatusFromVideo(
@@ -1025,13 +894,12 @@ export async function contentNft_OfferStarted({ event, store }: EventContext & S
   // specific event processing
 
   // load NFT
-  const { video, nft } = await getNftFromVideo(
-    store,
-    videoId.toString(),
-    'Non-existing video was offered',
-    'Non-existing nft was offered',
-    ['nft.ownerMember', 'nft.ownerCuratorGroup', 'nft.creatorChannel']
-  )
+  const nft = await getByIdOrFail(store, OwnedNft, videoId.toString(), [
+    'video',
+    'ownerMember',
+    'ownerCuratorGroup',
+    'creatorChannel',
+  ])
 
   // update NFT transactional status
   const transactionalStatus = new TransactionalStatusInitiatedOfferToMember()
@@ -1044,7 +912,7 @@ export async function contentNft_OfferStarted({ event, store }: EventContext & S
   const offerStartedEvent = new OfferStartedEvent({
     ...genericEventFields(event),
 
-    video,
+    video: nft.video,
     contentActor: await convertContentActor(store, contentActor),
     member: new Membership({ id: memberId.toString() }),
     price: price.unwrapOr(undefined),
@@ -1063,13 +931,12 @@ export async function contentNft_OfferAccepted({ event, store }: EventContext &
   // specific event processing
 
   // load NFT
-  const { video, nft } = await getNftFromVideo(
-    store,
-    videoId.toString(),
-    'Non-existing video sell offer was accepted',
-    'Non-existing nft sell offer was accepted',
-    ['nft.ownerMember', 'nft.ownerCuratorGroup', 'nft.creatorChannel']
-  )
+  const nft = await getByIdOrFail(store, OwnedNft, videoId.toString(), [
+    'video',
+    'ownerMember',
+    'ownerCuratorGroup',
+    'creatorChannel',
+  ])
 
   // read member from offer
   const memberId = (nft.transactionalStatus as TransactionalStatusInitiatedOfferToMember).memberId
@@ -1100,7 +967,7 @@ export async function contentNft_OfferAccepted({ event, store }: EventContext &
   const offerAcceptedEvent = new OfferAcceptedEvent({
     ...genericEventFields(event),
 
-    video,
+    video: nft.video,
     ownerMember: nft.ownerMember,
     ownerCuratorGroup: nft.ownerCuratorGroup,
     price,
@@ -1117,12 +984,7 @@ export async function contentNft_OfferCanceled({ event, store }: EventContext &
   // specific event processing
 
   // load video
-  const video = await getRequiredExistingEntity(
-    store,
-    Video,
-    videoId.toString(),
-    'Non-existing video sell offer was canceled'
-  )
+  const video = await getByIdOrFail(store, Video, videoId.toString())
 
   // update NFT's transactional status
   await resetNftTransactionalStatusFromVideo(
@@ -1154,13 +1016,12 @@ export async function contentNft_NftSellOrderMade({ event, store }: EventContext
   // specific event processing
 
   // load NFT
-  const { video, nft } = await getNftFromVideo(
-    store,
-    videoId.toString(),
-    'Non-existing video was offered',
-    'Non-existing nft was offered',
-    ['nft.ownerMember', 'nft.ownerCuratorGroup', 'nft.creatorChannel']
-  )
+  const nft = await getByIdOrFail(store, OwnedNft, videoId.toString(), [
+    'video',
+    'ownerMember',
+    'ownerCuratorGroup',
+    'creatorChannel',
+  ])
 
   // update NFT transactional status
   const transactionalStatus = new TransactionalStatusBuyNow()
@@ -1172,7 +1033,7 @@ export async function contentNft_NftSellOrderMade({ event, store }: EventContext
   const nftSellOrderMadeEvent = new NftSellOrderMadeEvent({
     ...genericEventFields(event),
 
-    video,
+    video: nft.video,
     contentActor: await convertContentActor(store, contentActor),
     price,
     // prepare Nft owner (handles fields `ownerMember` and `ownerCuratorGroup`)
@@ -1189,14 +1050,13 @@ export async function contentNft_NftBought({ event, store }: EventContext & Stor
 
   // specific event processing
 
-  // load video
-  const { video, nft } = await getNftFromVideo(
-    store,
-    videoId.toString(),
-    'Non-existing video was bought',
-    'Non-existing NFT was bought',
-    ['nft.ownerMember', 'nft.ownerCuratorGroup', 'nft.creatorChannel']
-  )
+  // load NFT
+  const nft = await getByIdOrFail(store, OwnedNft, videoId.toString(), [
+    'video',
+    'ownerMember',
+    'ownerCuratorGroup',
+    'creatorChannel',
+  ])
 
   // read member
   const winner = new Membership({ id: memberId.toString() })
@@ -1224,7 +1084,7 @@ export async function contentNft_NftBought({ event, store }: EventContext & Stor
   const nftBoughtEvent = new NftBoughtEvent({
     ...genericEventFields(event),
 
-    video,
+    video: nft.video,
     member: winner,
     ownerMember: nft.ownerMember,
     ownerCuratorGroup: nft.ownerCuratorGroup,
@@ -1242,12 +1102,7 @@ export async function contentNft_BuyNowCanceled({ event, store }: EventContext &
   // specific event processing
 
   // load video
-  const video = await getRequiredExistingEntity(
-    store,
-    Video,
-    videoId.toString(),
-    'Non-existing video buy-now was canceled'
-  )
+  const video = await getByIdOrFail(store, Video, videoId.toString())
 
   await resetNftTransactionalStatusFromVideo(
     store,
@@ -1277,13 +1132,12 @@ export async function contentNft_BuyNowPriceUpdated({ event, store }: EventConte
 
   // specific event processing
 
-  const { nft, video } = await getNftFromVideo(
-    store,
-    videoId.toString(),
-    'Non-existing video sell offer was accepted',
-    'Non-existing nft sell offer was accepted',
-    ['nft.ownerMember', 'nft.ownerCuratorGroup', 'nft.creatorChannel']
-  )
+  const nft = await getByIdOrFail(store, OwnedNft, videoId.toString(), [
+    'video',
+    'ownerMember',
+    'ownerCuratorGroup',
+    'creatorChannel',
+  ])
 
   const newTransactionalStatus = new TransactionalStatusBuyNow()
   newTransactionalStatus.price = new BN(newPrice.toString()) // this "typecast" is needed to prevent error
@@ -1295,7 +1149,7 @@ export async function contentNft_BuyNowPriceUpdated({ event, store }: EventConte
   const buyNowPriceUpdatedEvent = new BuyNowPriceUpdatedEvent({
     ...genericEventFields(event),
 
-    video,
+    video: nft.video,
     contentActor: await convertContentActor(store, contentActor),
     newPrice: newPrice,
     ownerMember: nft.ownerMember,
@@ -1314,23 +1168,19 @@ export async function contentNft_NftSlingedBackToTheOriginalArtist({
   const [videoId, contentActor] = new NftSlingedBackToTheOriginalArtistEvent_V1001(event).params
 
   // load NFT
-  const { video, nft } = await getNftFromVideo(
-    store,
-    videoId.toString(),
-    'Non-existing video was slinged',
-    'Non-existing nft was slinged',
-    [
-      'channel',
-      'channel.ownerCuratorGroup',
-      'channel.ownerMember',
-      'nft.ownerMember',
-      'nft.ownerCuratorGroup',
-      'nft.creatorChannel',
-    ]
-  )
 
-  nft.ownerMember = video.channel?.ownerMember
-  nft.ownerCuratorGroup = video.channel?.ownerCuratorGroup
+  const nft = await getByIdOrFail(store, OwnedNft, videoId.toString(), [
+    'ownerMember',
+    'ownerCuratorGroup',
+    'creatorChannel',
+    'video',
+    'video.channel',
+    'video.channel.ownerMember',
+    'video.channel.ownerCuratorGroup',
+  ] as RelationsArr<OwnedNft>)
+
+  nft.ownerMember = nft.video.channel.ownerMember
+  nft.ownerCuratorGroup = nft.video.channel.ownerCuratorGroup
   nft.isOwnedByChannel = true
 
   await getAllManagers(store).videoNfts.onMainEntityUpdate(nft)
@@ -1341,7 +1191,7 @@ export async function contentNft_NftSlingedBackToTheOriginalArtist({
 
   const nftSlingedBackToTheOriginalArtistEvent = new NftSlingedBackToTheOriginalArtistEvent({
     ...genericEventFields(event),
-    video,
+    video: nft.video,
     contentActor: await convertContentActor(store, contentActor),
     ownerMember: nft.ownerMember,
     ownerCuratorGroup: nft.ownerCuratorGroup,
diff --git a/query-node/mappings/src/content/utils.ts b/query-node/mappings/src/content/utils.ts
index 27f3db3745..388440611e 100644
--- a/query-node/mappings/src/content/utils.ts
+++ b/query-node/mappings/src/content/utils.ts
@@ -1,59 +1,67 @@
 import { DatabaseManager, EventContext, StoreContext } from '@joystream/hydra-common'
 import {
-  IVideoMetadata,
-  IPublishedBeforeJoystream,
+  IAppAction,
+  IChannelMetadata,
   ILicense,
   IMediaType,
-  IChannelMetadata,
+  IPublishedBeforeJoystream,
   ISubtitleMetadata,
-  IAppAction,
+  IVideoMetadata,
 } from '@joystream/metadata-protobuf'
 import { integrateMeta, isSet, isValidLanguageCode } from '@joystream/metadata-protobuf/utils'
 import { ed25519Verify } from '@polkadot/util-crypto'
-import { invalidMetadata, inconsistentState, logger, deterministicEntityId, EntityType } from '../common'
 import {
+  App,
+  Channel,
+  ContentActorCurator,
+  ContentActorLead,
+  ContentActorMember,
+  ContentActor as ContentActorVariant,
+  Curator,
   // primary entities
   CuratorGroup,
-  Channel,
-  Video,
-  VideoCategory,
+  DataObjectTypeChannelAvatar,
+  DataObjectTypeChannelCoverPhoto,
+  DataObjectTypeVideoMedia,
+  DataObjectTypeVideoSubtitle,
+  DataObjectTypeVideoThumbnail,
   // secondary entities
   Language,
   License,
-  VideoMediaMetadata,
-  App,
   // asset
   Membership,
-  VideoMediaEncoding,
   StorageDataObject,
-  DataObjectTypeChannelAvatar,
-  DataObjectTypeChannelCoverPhoto,
-  DataObjectTypeVideoMedia,
-  DataObjectTypeVideoThumbnail,
-  ContentActorLead,
-  ContentActorCurator,
-  ContentActorMember,
-  ContentActor as ContentActorVariant,
-  Curator,
-  DataObjectTypeVideoSubtitle,
+  Video,
+  VideoCategory,
+  VideoMediaEncoding,
+  VideoMediaMetadata,
   VideoSubtitle,
 } from 'query-node/dist/model'
+import {
+  EntityType,
+  RelationsArr,
+  deterministicEntityId,
+  getById,
+  getByIdOrFail,
+  getMembershipById,
+  invalidMetadata,
+  logger,
+} from '../common'
 // Joystream types
+import { DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
+import { createType } from '@joystream/types'
+import { DataObjectId } from '@joystream/types/primitives'
+import { BTreeSet } from '@polkadot/types'
 import {
   PalletContentChannelOwner as ChannelOwner,
   PalletContentPermissionsContentActor as ContentActor,
   PalletContentIterableEnumsChannelActionPermission,
 } from '@polkadot/types/lookup'
-import { DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
+import { Bytes } from '@polkadot/types/primitive'
+import { u8aToHex } from '@polkadot/util'
 import BN from 'bn.js'
 import _ from 'lodash'
 import { getSortedDataObjectsByIds } from '../storage/utils'
-import { BTreeSet } from '@polkadot/types'
-import { DataObjectId } from '@joystream/types/primitives'
-import { Bytes } from '@polkadot/types/primitive'
-import { u8aToHex } from '@polkadot/util'
-import { createType } from '@joystream/types'
-import { getAppById } from './app'
 
 const ASSET_TYPES = {
   channel: [
@@ -184,7 +192,7 @@ async function validateAndGetApp(
     return undefined
   }
 
-  const app = await getAppById(ctx.store, appAction.appId)
+  const app = await getById(ctx.store, App, appAction.appId, ['ownerMember'])
 
   if (!app) {
     invalidMetadata('No app of given id found')
@@ -371,30 +379,14 @@ export async function convertChannelOwnerToMemberOrCuratorGroup(
   ownerCuratorGroup?: CuratorGroup
 }> {
   if (channelOwner.isMember) {
-    const member = await store.get(Membership, {
-      where: { id: channelOwner.asMember.toString() },
-    })
-
-    // ensure member exists
-    if (!member) {
-      return inconsistentState(`Channel owner is non-existing member`, channelOwner.asMember)
-    }
-
+    const member = await getByIdOrFail(store, Membership, channelOwner.asMember.toString())
     return {
       ownerMember: member,
       ownerCuratorGroup: undefined,
     }
   }
 
-  const curatorGroup = await store.get(CuratorGroup, {
-    where: { id: channelOwner.asCuratorGroup.toString() },
-  })
-
-  // ensure curator group exists
-  if (!curatorGroup) {
-    return inconsistentState('Channel owner is non-existing curator group', channelOwner.asCuratorGroup)
-  }
-
+  const curatorGroup = await getByIdOrFail(store, CuratorGroup, channelOwner.asCuratorGroup.toString())
   return {
     ownerMember: undefined,
     ownerCuratorGroup: curatorGroup,
@@ -409,14 +401,7 @@ export async function convertContentActorToChannelOrNftOwner(
   ownerCuratorGroup?: CuratorGroup
 }> {
   if (contentActor.isMember) {
-    const memberId = contentActor.asMember.toNumber()
-    const member = await store.get(Membership, { where: { id: memberId.toString() } })
-
-    // ensure member exists
-    if (!member) {
-      return inconsistentState(`Actor is non-existing member`, memberId)
-    }
-
+    const member = await getMembershipById(store, contentActor.asMember)
     return {
       ownerMember: member,
       ownerCuratorGroup: undefined, // this will clear the field
@@ -424,15 +409,8 @@ export async function convertContentActorToChannelOrNftOwner(
   }
 
   if (contentActor.isCurator) {
-    const curatorGroupId = contentActor.asCurator[0].toNumber()
-    const curatorGroup = await store.get(CuratorGroup, {
-      where: { id: curatorGroupId.toString() },
-    })
-
-    // ensure curator group exists
-    if (!curatorGroup) {
-      return inconsistentState('Actor is non-existing curator group', curatorGroupId)
-    }
+    const curatorGroupId = contentActor.asCurator[0].toString()
+    const curatorGroup = await getByIdOrFail(store, CuratorGroup, curatorGroupId)
 
     return {
       ownerMember: undefined, // this will clear the field
@@ -440,10 +418,7 @@ export async function convertContentActorToChannelOrNftOwner(
     }
   }
 
-  // TODO: contentActor.isLead
-
-  logger.error('Not implemented ContentActor type', { contentActor: contentActor.toString() })
-  throw new Error('Not-implemented ContentActor type used')
+  return { ownerMember: undefined, ownerCuratorGroup: undefined }
 }
 
 export async function convertContentActor(
@@ -451,43 +426,21 @@ export async function convertContentActor(
   contentActor: ContentActor
 ): Promise<typeof ContentActorVariant> {
   if (contentActor.isMember) {
-    const memberId = contentActor.asMember.toNumber()
-    const member = await store.get(Membership, { where: { id: memberId.toString() } })
-
-    // ensure member exists
-    if (!member) {
-      return inconsistentState(`Actor is non-existing member`, memberId)
-    }
-
+    const member = await getMembershipById(store, contentActor.asMember)
     const result = new ContentActorMember()
     result.member = member
-
     return result
   }
 
   if (contentActor.isCurator) {
-    const curatorId = contentActor.asCurator[1].toNumber()
-    const curator = await store.get(Curator, {
-      where: { id: curatorId.toString() },
-    })
-
-    // ensure curator group exists
-    if (!curator) {
-      return inconsistentState('Actor is non-existing curator group', curatorId)
-    }
-
+    const curatorId = contentActor.asCurator[1].toString()
+    const curator = await getByIdOrFail(store, Curator, curatorId)
     const result = new ContentActorCurator()
     result.curator = curator
-
     return result
   }
 
-  if (contentActor.isLead) {
-    return new ContentActorLead()
-  }
-
-  logger.error('Not implemented ContentActor type', { contentActor: contentActor.toString() })
-  throw new Error('Not-implemented ContentActor type used')
+  return new ContentActorLead()
 }
 
 function processPublishedBeforeJoystream(
@@ -753,3 +706,11 @@ export function mapAgentPermission(permission: PalletContentIterableEnumsChannel
 export function u8aToBytes(array?: Uint8Array | null): Bytes {
   return createType('Bytes', array ? u8aToHex(array) : '')
 }
+
+export async function getChannelOrFail(
+  store: DatabaseManager,
+  channelId: string,
+  relations?: RelationsArr<Channel>
+): Promise<Channel> {
+  return getByIdOrFail(store, Channel, channelId, relations)
+}
diff --git a/query-node/mappings/src/content/video.ts b/query-node/mappings/src/content/video.ts
index 9321f340a1..edf392d4dd 100644
--- a/query-node/mappings/src/content/video.ts
+++ b/query-node/mappings/src/content/video.ts
@@ -2,15 +2,18 @@
 eslint-disable @typescript-eslint/naming-convention
 */
 import { DatabaseManager, EventContext, StoreContext } from '@joystream/hydra-common'
+import { generateAppActionCommitment } from '@joystream/js/utils'
 import { AppAction, AppActionMetadata, ContentMetadata, IAppAction, IVideoMetadata } from '@joystream/metadata-protobuf'
+import { DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
+import { integrateMeta } from '@joystream/metadata-protobuf/utils'
 import { ChannelId, DataObjectId, VideoId } from '@joystream/types/primitives'
+import { BaseModel } from '@joystream/warthog'
+import { BTreeSet } from '@polkadot/types'
 import {
   PalletContentPermissionsContentActor as ContentActor,
   PalletContentVideoCreationParametersRecord as VideoCreationParameters,
   PalletContentVideoUpdateParametersRecord as VideoUpdateParameters,
 } from '@polkadot/types/lookup'
-import { FindOptionsWhere, In } from 'typeorm'
-import { BaseModel } from '@joystream/warthog'
 import {
   Channel,
   Comment,
@@ -35,16 +38,16 @@ import {
   VideoSubtitle,
   VideoVisibilitySetByModeratorEvent,
 } from 'query-node/dist/model'
+import { FindOptionsWhere, In } from 'typeorm'
 import {
   Content_VideoAssetsDeletedByModeratorEvent_V1001 as VideoAssetsDeletedByModeratorEvent_V1001,
+  Content_VideoCreatedEvent_V1001 as VideoCreatedEvent_V1001,
   Content_VideoDeletedByModeratorEvent_V1001 as VideoDeletedByModeratorEvent_V1001,
   Content_VideoDeletedEvent_V1001 as VideoDeletedEvent_V1001,
   Content_VideoUpdatedEvent_V1001 as VideoUpdatedEvent_V1001,
   Content_VideoVisibilitySetByModeratorEvent_V1001 as VideoVisibilitySetByModeratorEvent_V1001,
-  Content_VideoCreatedEvent_V1001 as VideoCreatedEvent_V1001,
 } from '../../generated/types'
-import { bytesToString, deserializeMetadata, genericEventFields, inconsistentState, logger } from '../common'
-import { DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
+import { RelationsArr, bytesToString, deserializeMetadata, genericEventFields, getByIdOrFail, logger } from '../common'
 import { getAllManagers } from '../derivedPropertiesManager/applications'
 import { createNft } from './nft'
 import {
@@ -56,9 +59,6 @@ import {
   unsetAssetRelations,
   videoRelationsForCounters,
 } from './utils'
-import { BTreeSet } from '@polkadot/types'
-import { integrateMeta } from '@joystream/metadata-protobuf/utils'
-import { generateAppActionCommitment } from '@joystream/js/utils'
 
 interface ContentCreatedEventData {
   contentActor: ContentActor
@@ -94,15 +94,7 @@ export async function content_ContentCreated(ctx: EventContext & StoreContext):
   }
 
   // load channel
-  const channel = await store.get(Channel, {
-    where: { id: channelId.toString() },
-    relations: ['ownerMember', 'ownerCuratorGroup'],
-  })
-
-  // ensure channel exists
-  if (!channel) {
-    return inconsistentState('Trying to add video to non-existing channel', channelId)
-  }
+  const channel = await getByIdOrFail(store, Channel, channelId.toString(), ['ownerMember', 'ownerCuratorGroup'])
 
   // deserialize & process metadata
   const appAction = meta.isSome ? deserializeMetadata(AppAction, meta.unwrap(), { skipWarning: true }) : undefined
@@ -207,36 +199,29 @@ export async function content_ContentUpdated(ctx: EventContext & StoreContext):
     newDataObjectIds,
   }
 
-  // load video
-  const video = await store.get(Video, {
-    where: { id: contentId.toString() },
-    relations: [
-      ...videoRelationsForCounters,
-      'license',
-      'channel.ownerMember',
-      'channel.ownerCuratorGroup',
-      'nft',
-      'mediaMetadata',
-      'mediaMetadata.encoding',
-    ],
-  })
+  // TODO: remove this after we have Playlist feature since
+  // TODO: we would then check if it is a Video or Playlist
 
-  if (video) {
-    const appAction = newMeta.isSome
-      ? deserializeMetadata(AppAction, newMeta.unwrap(), { skipWarning: true })
-      : undefined
-    if (appAction) {
-      const contentMetadataBytes = u8aToBytes(appAction.rawAction)
-      const videoMetadata = deserializeMetadata(ContentMetadata, contentMetadataBytes)?.videoMetadata
-      await processUpdateVideoMessage(ctx, video, videoMetadata ?? undefined, contentUpdatedEventData)
-    } else {
-      const contentMetadata = newMeta.isSome ? deserializeMetadata(ContentMetadata, newMeta.unwrap()) : undefined
-      await processUpdateVideoMessage(ctx, video, contentMetadata?.videoMetadata || undefined, contentUpdatedEventData)
-    }
-    return
+  // load video
+  const video = await getByIdOrFail(store, Video, contentId.toString(), [
+    ...videoRelationsForCounters,
+    'license',
+    'channel.ownerMember',
+    'channel.ownerCuratorGroup',
+    'nft',
+    'mediaMetadata',
+    'mediaMetadata.encoding',
+  ] as RelationsArr<Video>)
+
+  const appAction = newMeta.isSome ? deserializeMetadata(AppAction, newMeta.unwrap(), { skipWarning: true }) : undefined
+  if (appAction) {
+    const contentMetadataBytes = u8aToBytes(appAction.rawAction)
+    const videoMetadata = deserializeMetadata(ContentMetadata, contentMetadataBytes)?.videoMetadata
+    await processUpdateVideoMessage(ctx, video, videoMetadata ?? undefined, contentUpdatedEventData)
+  } else {
+    const contentMetadata = newMeta.isSome ? deserializeMetadata(ContentMetadata, newMeta.unwrap()) : undefined
+    await processUpdateVideoMessage(ctx, video, contentMetadata?.videoMetadata || undefined, contentUpdatedEventData)
   }
-
-  inconsistentState('Non-existing content update requested', contentId)
 }
 
 export async function processUpdateVideoMessage(
@@ -364,15 +349,7 @@ export async function content_VideoVisibilitySetByModerator({
   const [actor, videoId, isCensored, rationale] = new VideoVisibilitySetByModeratorEvent_V1001(event).params
 
   // load video
-  const video = await store.get(Video, {
-    where: { id: videoId.toString() },
-    relations: [...videoRelationsForCounters],
-  })
-
-  // ensure video exists
-  if (!video) {
-    return inconsistentState('Non-existing video censoring requested', videoId)
-  }
+  const video = await getByIdOrFail(store, Video, videoId.toString(), [...videoRelationsForCounters])
 
   // update video
   video.isCensored = isCensored.isTrue
@@ -402,15 +379,7 @@ export async function content_VideoVisibilitySetByModerator({
 
 async function deleteVideo(store: DatabaseManager, videoId: VideoId) {
   // load video
-  const video = await store.get(Video, {
-    where: { id: videoId.toString() },
-    relations: [...videoRelationsForCounters],
-  })
-
-  // ensure video exists
-  if (!video) {
-    return inconsistentState('Non-existing video deletion requested', videoId)
-  }
+  const video = await getByIdOrFail(store, Video, videoId.toString(), [...videoRelationsForCounters])
 
   // update video active counters
   await getAllManagers(store).videos.onMainEntityDeletion(video)
diff --git a/query-node/mappings/src/content/videoCategory.ts b/query-node/mappings/src/content/videoCategory.ts
index 8efb5e7099..e0f82b62cb 100644
--- a/query-node/mappings/src/content/videoCategory.ts
+++ b/query-node/mappings/src/content/videoCategory.ts
@@ -1,10 +1,10 @@
-import { VideoCategory } from 'query-node/dist/model'
-import { invalidMetadata, logger } from '../common'
 import { DatabaseManager, SubstrateEvent } from '@joystream/hydra-common'
 import { ICreateVideoCategory } from '@joystream/metadata-protobuf'
 import { DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
+import { VideoCategory } from 'query-node/dist/model'
+import { getById, invalidMetadata, logger } from '../common'
 
-export async function createVideoCategory(
+export async function processCreateVideoCategoryMessage(
   store: DatabaseManager,
   event: SubstrateEvent,
   categoryData: DecodedMetadataObject<ICreateVideoCategory>
@@ -14,8 +14,7 @@ export async function createVideoCategory(
   let parentCategory: VideoCategory | undefined
 
   if (categoryData.parentCategoryId) {
-    parentCategory = await store.get<VideoCategory>(VideoCategory, { where: { id: categoryData.parentCategoryId } })
-
+    parentCategory = await getById(store, VideoCategory, categoryData.parentCategoryId)
     if (!parentCategory) {
       invalidMetadata('Non-existing parent video category request', categoryData.parentCategoryId)
     }
diff --git a/query-node/mappings/src/council.ts b/query-node/mappings/src/council.ts
index c02aa0e3ff..ca50300a97 100644
--- a/query-node/mappings/src/council.ts
+++ b/query-node/mappings/src/council.ts
@@ -1,14 +1,14 @@
-import {
-  DatabaseManager,
-  EventContext,
-  FindOptionsOrder,
-  FindOptionsWhere,
-  StoreContext,
-  SubstrateEvent,
-} from '@joystream/hydra-common'
+import { DatabaseManager, EventContext, FindOptionsWhere, StoreContext, SubstrateEvent } from '@joystream/hydra-common'
 import BN from 'bn.js'
-import { FindOneOptions } from 'typeorm'
-import { CURRENT_NETWORK, deserializeMetadata, genericEventFields } from './common'
+import {
+  CURRENT_NETWORK,
+  RelationsArr,
+  deserializeMetadata,
+  genericEventFields,
+  getMembershipById,
+  getOneByOrFail,
+  inconsistentState,
+} from './common'
 
 import { CouncilCandidacyNoteMetadata } from '@joystream/metadata-protobuf'
 import { isSet } from '@joystream/metadata-protobuf/utils'
@@ -86,19 +86,6 @@ import {
 
 /// /////////////// Common - Gets //////////////////////////////////////////////
 
-/*
-  Retrieves the member record by its id.
-*/
-async function getMembership(store: DatabaseManager, memberId: string): Promise<Membership | undefined> {
-  const member = await store.get(Membership, { where: { id: memberId } })
-
-  if (!member) {
-    throw new Error(`Membership not found. memberId '${memberId}'`)
-  }
-
-  return member
-}
-
 /*
   Retrieves the council candidate by its member id. Returns the last record for the member
   if the election round isn't explicitly set.
@@ -121,15 +108,14 @@ async function getCandidate(
     where.electionRound = { id: electionRound.id.toString() }
   }
 
-  const event = await store.get(NewCandidateEvent, {
+  const event = await getOneByOrFail(
+    store,
+    NewCandidateEvent,
     where,
-    order: { inBlock: 'DESC', indexInBlock: 'DESC' },
-    relations: ['candidate'].concat(relations.map((r) => `candidate.${r}`)),
-  })
-
-  if (!event) {
-    throw new Error(`Candidate not found. memberId '${memberId}' electionRound '${electionRound?.id}'`)
-  }
+    ['candidate'].concat(relations.map((r) => `candidate.${r}`)) as RelationsArr<NewCandidateEvent>,
+    { inBlock: 'DESC', indexInBlock: 'DESC' },
+    `Candidate not found. memberId '${memberId}' electionRound '${electionRound?.id}'`
+  )
 
   return event.candidate
 }
@@ -138,14 +124,9 @@ async function getCandidate(
   Retrieves the member's last council member record.
 */
 async function getCouncilMember(store: DatabaseManager, memberId: string): Promise<CouncilMember> {
-  const councilMember = await store.get(CouncilMember, {
-    where: { memberId: memberId },
-    order: { createdAt: 'DESC' },
-  } as FindOneOptions<CouncilMember>)
-
-  if (!councilMember) {
-    throw new Error(`Council member not found. memberId '${memberId}'`)
-  }
+  const councilMember = await getOneByOrFail(store, CouncilMember, { member: { id: memberId } }, undefined, {
+    createdAt: 'DESC',
+  })
 
   return councilMember
 }
@@ -153,12 +134,11 @@ async function getCouncilMember(store: DatabaseManager, memberId: string): Promi
 /*
   Returns the current election round record.
 */
-async function getCurrentElectionRound(store: DatabaseManager, relations: string[] = []): Promise<ElectionRound> {
-  const electionRound = await store.get(ElectionRound, { order: { cycleId: 'DESC' }, relations: relations })
-
-  if (!electionRound) {
-    throw new Error(`No election round found`)
-  }
+async function getCurrentElectionRound(
+  store: DatabaseManager,
+  relations: RelationsArr<ElectionRound> = []
+): Promise<ElectionRound> {
+  const electionRound = await getOneByOrFail(store, ElectionRound, undefined, relations, { cycleId: 'DESC' })
 
   return electionRound
 }
@@ -167,12 +147,7 @@ async function getCurrentElectionRound(store: DatabaseManager, relations: string
   Returns the last council stage update.
 */
 async function getCurrentStageUpdate(store: DatabaseManager): Promise<CouncilStageUpdate> {
-  const stageUpdate = await store.get(CouncilStageUpdate, { order: { changedAt: 'DESC' } as FindOptionsOrder<any> }) // TODO: get rid of `any` typecast
-
-  if (!stageUpdate) {
-    throw new Error('No stage update found.')
-  }
-
+  const stageUpdate = await getOneByOrFail(store, CouncilStageUpdate, undefined, undefined, { changedAt: 'DESC' })
   return stageUpdate
 }
 
@@ -186,10 +161,10 @@ export async function getCurrentElectedCouncil(store: DatabaseManager): Promise<
   return electedCouncil as ElectedCouncil
 }
 
-/*
-  Returns the last vote cast in an election by the given account. Returns the last record for the account
-  if the election round isn't explicitly set.
-*/
+/**
+ * Returns the last vote cast in an election by the given account. Returns the last record for the account
+ * if the election round isn't explicitly set.
+ */
 async function getAccountCastVote(
   store: DatabaseManager,
   account: string,
@@ -201,13 +176,14 @@ async function getAccountCastVote(
     where.electionRound = { id: electionRound.id.toString() }
   }
 
-  const castVote = await store.get(CastVote, { where, order: { createdAt: 'DESC' } } as FindOneOptions<CastVote>)
-
-  if (!castVote) {
-    throw new Error(
-      `No vote cast by the given account in the current election round. accountId '${account}', cycleId '${electionRound?.cycleId}'`
-    )
-  }
+  const castVote = getOneByOrFail(
+    store,
+    CastVote,
+    where,
+    undefined,
+    { createdAt: 'DESC' },
+    `No vote cast by the given account in the current election round. accountId '${account}', cycleId '${electionRound?.cycleId}'`
+  )
 
   return castVote
 }
@@ -445,14 +421,14 @@ export async function council_NewCandidate({ event, store }: EventContext & Stor
   // common event processing - init
 
   const [memberId, stakingAccount, rewardAccount, balance] = new NewCandidateEvent_V1001(event).params
-  const member = await getMembership(store, memberId.toString())
+  const member = await getMembershipById(store, memberId)
 
   // specific event processing
 
   // increase candidate count in stage update record
   const lastStageUpdate = await getCurrentStageUpdate(store)
   if (!isCouncilStageAnnouncing(lastStageUpdate.stage)) {
-    throw new Error(`Unexpected council stage "${lastStageUpdate.stage.isTypeOf}"`)
+    inconsistentState(`Unexpected council stage "${lastStageUpdate.stage.isTypeOf}"`)
   }
 
   lastStageUpdate.stage.candidatesCount = new BN(lastStageUpdate.stage.candidatesCount).add(new BN(1))
diff --git a/query-node/mappings/src/forum.ts b/query-node/mappings/src/forum.ts
index 9e166cee4f..e8e80912d0 100644
--- a/query-node/mappings/src/forum.ts
+++ b/query-node/mappings/src/forum.ts
@@ -1,51 +1,49 @@
 /*
 eslint-disable @typescript-eslint/naming-convention
 */
-import { EventContext, StoreContext, DatabaseManager, SubstrateEvent } from '@joystream/hydra-common'
-import {
-  bytesToString,
-  deserializeMetadata,
-  genericEventFields,
-  getWorker,
-  inconsistentState,
-  invalidMetadata,
-  perpareString,
-} from './common'
+import { DatabaseManager, EventContext, StoreContext, SubstrateEvent } from '@joystream/hydra-common'
+import { ForumPostMetadata, ForumThreadMetadata } from '@joystream/metadata-protobuf'
+import { MAX_TAGS_PER_FORUM_THREAD } from '@joystream/metadata-protobuf/consts'
+import { isSet } from '@joystream/metadata-protobuf/utils'
+import { Bytes } from '@polkadot/types'
+import { PalletForumPrivilegedActor as PrivilegedActor } from '@polkadot/types/lookup'
+import _ from 'lodash'
 import {
+  CategoryArchivalStatusUpdatedEvent,
   CategoryCreatedEvent,
+  CategoryDeletedEvent,
+  CategoryMembershipOfModeratorUpdatedEvent,
   CategoryStatusActive,
-  CategoryArchivalStatusUpdatedEvent,
-  ForumCategory,
-  Worker,
   CategoryStatusArchived,
-  CategoryDeletedEvent,
   CategoryStatusRemoved,
-  ThreadCreatedEvent,
+  CategoryStickyThreadUpdateEvent,
+  ForumCategory,
+  ForumPost,
   ForumThread,
+  ForumThreadTag,
   Membership,
-  ThreadStatusActive,
-  ThreadModeratedEvent,
-  ThreadStatusModerated,
-  ThreadMetadataUpdatedEvent,
-  ThreadDeletedEvent,
-  ThreadStatusLocked,
-  ThreadStatusRemoved,
-  ThreadMovedEvent,
-  ForumPost,
-  PostStatusActive,
-  PostOriginThreadInitial,
   PostAddedEvent,
-  PostStatusLocked,
-  PostOriginThreadReply,
-  CategoryStickyThreadUpdateEvent,
-  CategoryMembershipOfModeratorUpdatedEvent,
+  PostDeletedEvent,
   PostModeratedEvent,
+  PostOriginThreadInitial,
+  PostOriginThreadReply,
+  PostStatusActive,
+  PostStatusLocked,
   PostStatusModerated,
-  PostTextUpdatedEvent,
-  PostDeletedEvent,
   PostStatusRemoved,
-  ForumThreadTag,
+  PostTextUpdatedEvent,
+  ThreadCreatedEvent,
+  ThreadDeletedEvent,
+  ThreadMetadataUpdatedEvent,
+  ThreadModeratedEvent,
+  ThreadMovedEvent,
+  ThreadStatusActive,
+  ThreadStatusLocked,
+  ThreadStatusModerated,
+  ThreadStatusRemoved,
+  Worker,
 } from 'query-node/dist/model'
+import { In, Not } from 'typeorm'
 import {
   Forum_CategoryArchivalStatusUpdatedEvent_V1001 as CategoryArchivalStatusUpdatedEvent_V1001,
   Forum_CategoryCreatedEvent_V1001 as CategoryCreatedEvent_V1001,
@@ -62,45 +60,42 @@ import {
   Forum_ThreadModeratedEvent_V1001 as ThreadModeratedEvent_V1001,
   Forum_ThreadMovedEvent_V1001 as ThreadMovedEvent_V1001,
 } from '../generated/types'
-import { PalletForumPrivilegedActor as PrivilegedActor } from '@polkadot/types/lookup'
-import { ForumPostMetadata, ForumThreadMetadata } from '@joystream/metadata-protobuf'
-import { isSet } from '@joystream/metadata-protobuf/utils'
-import { MAX_TAGS_PER_FORUM_THREAD } from '@joystream/metadata-protobuf/consts'
-import { Not, In } from 'typeorm'
-import { Bytes } from '@polkadot/types'
-import _ from 'lodash'
-
-async function getCategory(store: DatabaseManager, categoryId: string, relations?: string[]): Promise<ForumCategory> {
-  const category = await store.get(ForumCategory, { where: { id: categoryId }, relations })
-  if (!category) {
-    throw new Error(`Forum category not found by id: ${categoryId}`)
-  }
+import {
+  RelationsArr,
+  bytesToString,
+  deserializeMetadata,
+  genericEventFields,
+  getByIdOrFail,
+  getOneByOrFail,
+  getWorkerOrFail,
+  invalidMetadata,
+  prepareString,
+} from './common'
 
-  return category
+async function getCategoryOrFail(
+  store: DatabaseManager,
+  categoryId: string,
+  relations?: RelationsArr<ForumCategory>
+): Promise<ForumCategory> {
+  return getByIdOrFail(store, ForumCategory, categoryId, relations)
 }
 
-async function getThread(store: DatabaseManager, threadId: string): Promise<ForumThread> {
-  const thread = await store.get(ForumThread, { where: { id: threadId } })
-  if (!thread) {
-    throw new Error(`Forum thread not found by id: ${threadId.toString()}`)
-  }
-
-  return thread
+async function getThreadOrFail(store: DatabaseManager, threadId: string): Promise<ForumThread> {
+  return getByIdOrFail(store, ForumThread, threadId)
 }
 
-async function getPost(store: DatabaseManager, postId: string, relations?: string[]): Promise<ForumPost> {
-  const post = await store.get(ForumPost, { where: { id: postId }, relations })
-  if (!post) {
-    throw new Error(`Forum post not found by id: ${postId}`)
-  }
-
-  return post
+async function getPostOrFail(
+  store: DatabaseManager,
+  postId: string,
+  relations?: RelationsArr<ForumPost>
+): Promise<ForumPost> {
+  return getByIdOrFail(store, ForumPost, postId, relations)
 }
 
 type ModerationType = 'runtime' | 'leadRemark' | 'workerRemark'
 
 async function canModerate(store: DatabaseManager, actorId: string, categoryId: string): Promise<boolean> {
-  const category = await getCategory(store, categoryId, ['moderators', 'parent'])
+  const category = await getCategoryOrFail(store, categoryId, ['moderators', 'parent'])
   return (
     category.moderators.some(({ id }) => id === actorId) ||
     (category.parent ? canModerate(store, actorId, category.parent.id) : false)
@@ -111,25 +106,18 @@ export async function moderatePost(
   store: DatabaseManager,
   event: SubstrateEvent,
   type: ModerationType,
-  postId: string,
+  post: ForumPost,
   actor: Worker,
   rationale: string
 ): Promise<void> {
-  const post = await store.get(ForumPost, { where: { id: postId }, relations: ['thread', 'thread.category'] })
-
-  if (!post) {
-    const message = `Forum post not found by id: ${postId}`
-    if (type === 'runtime') {
-      throw Error(message)
-    }
-    return invalidMetadata(message)
-  }
+  const thread = await getOneByOrFail(store, ForumThread, { posts: { id: post.id } }, ['category'])
+
   if (type !== 'runtime' && post.status.isTypeOf !== 'PostStatusLocked') {
     return invalidMetadata(
       `Trying to moderate forum post ${post.id}, with status ${post.status.isTypeOf}. Only locked forum post can be moderated with remark`
     )
   }
-  if (type === 'workerRemark' && !(await canModerate(store, actor.id, post.thread.category.id))) {
+  if (type === 'workerRemark' && !(await canModerate(store, actor.id, thread.category.id))) {
     return invalidMetadata(`The worker ${actor.id} can not moderate the post: ${post.id}`)
   }
 
@@ -149,30 +137,27 @@ export async function moderatePost(
   post.isVisible = false
   await store.save<ForumPost>(post)
 
-  const { thread } = post
   --thread.visiblePostsCount
   await store.save<ForumThread>(thread)
 }
 
 async function getActorWorker(store: DatabaseManager, actor: PrivilegedActor): Promise<Worker> {
-  const worker = await store.get(Worker, {
-    where: {
+  const worker = await getOneByOrFail(
+    store,
+    Worker,
+    {
       group: { id: 'forumWorkingGroup' },
       ...(actor.isLead ? { isLead: true } : { runtimeId: actor.asModerator.toNumber() }),
     },
-    relations: ['group'],
-  })
-
-  if (!worker) {
-    throw new Error(`Corresponding worker not found by forum PrivielagedActor: ${JSON.stringify(actor.toHuman())}`)
-  }
+    ['group']
+  )
 
   return worker
 }
 
 function normalizeForumTagLabel(label: string): string {
   // Optionally: normalize to lowercase & ASCII only?
-  return perpareString(label)
+  return prepareString(label)
 }
 
 function parseThreadMetadata(metaBytes: Bytes) {
@@ -211,9 +196,6 @@ async function unsetThreadTags({ store }: StoreContext & EventContext, tags: For
   await Promise.all(
     tags.map(async (forumTag) => {
       --forumTag.visibleThreadsCount
-      if (forumTag.visibleThreadsCount < 0) {
-        inconsistentState('Trying to update forumTag.visibleThreadsCount to a number below 0!')
-      }
       await store.save<ForumThreadTag>(forumTag)
     })
   )
@@ -244,7 +226,7 @@ export async function forum_CategoryArchivalStatusUpdated({
   store,
 }: EventContext & StoreContext): Promise<void> {
   const [categoryId, newArchivalStatus, privilegedActor] = new CategoryArchivalStatusUpdatedEvent_V1001(event).params
-  const category = await getCategory(store, categoryId.toString())
+  const category = await getCategoryOrFail(store, categoryId.toString())
   const actorWorker = await getActorWorker(store, privilegedActor)
 
   const categoryArchivalStatusUpdatedEvent = new CategoryArchivalStatusUpdatedEvent({
@@ -267,7 +249,7 @@ export async function forum_CategoryArchivalStatusUpdated({
 
 export async function forum_CategoryDeleted({ event, store }: EventContext & StoreContext): Promise<void> {
   const [categoryId, privilegedActor] = new CategoryDeletedEvent_V1001(event).params
-  const category = await getCategory(store, categoryId.toString())
+  const category = await getCategoryOrFail(store, categoryId.toString())
   const actorWorker = await getActorWorker(store, privilegedActor)
 
   const categoryDeletedEvent = new CategoryDeletedEvent({
@@ -335,7 +317,7 @@ export async function forum_ThreadModerated(ctx: EventContext & StoreContext): P
   const { event, store } = ctx
   const [threadId, rationaleBytes, privilegedActor] = new ThreadModeratedEvent_V1001(event).params
   const actorWorker = await getActorWorker(store, privilegedActor)
-  const thread = await getThread(store, threadId.toString())
+  const thread = await getThreadOrFail(store, threadId.toString())
 
   const threadModeratedEvent = new ThreadModeratedEvent({
     ...genericEventFields(event),
@@ -359,7 +341,7 @@ export async function forum_ThreadModerated(ctx: EventContext & StoreContext): P
 export async function forum_ThreadMetadataUpdated(ctx: EventContext & StoreContext): Promise<void> {
   const { event, store } = ctx
   const [threadId, , , newMetadataBytes] = new ThreadMetadataUpdatedEvent_V1001(event).params
-  const thread = await getThread(store, threadId.toString())
+  const thread = await getThreadOrFail(store, threadId.toString())
 
   const { title: newTitle, tags: newTagIds } = parseThreadMetadata(newMetadataBytes)
 
@@ -394,7 +376,7 @@ export async function forum_ThreadMetadataUpdated(ctx: EventContext & StoreConte
 export async function forum_ThreadDeleted(ctx: EventContext & StoreContext): Promise<void> {
   const { event, store } = ctx
   const [threadId, , , hide] = new ThreadDeletedEvent_V1001(event).params
-  const thread = await getThread(store, threadId.toString())
+  const thread = await getThreadOrFail(store, threadId.toString())
 
   const threadDeletedEvent = new ThreadDeletedEvent({
     ...genericEventFields(event),
@@ -416,7 +398,7 @@ export async function forum_ThreadDeleted(ctx: EventContext & StoreContext): Pro
 
 export async function forum_ThreadMoved({ event, store }: EventContext & StoreContext): Promise<void> {
   const [threadId, newCategoryId, privilegedActor, oldCategoryId] = new ThreadMovedEvent_V1001(event).params
-  const thread = await getThread(store, threadId.toString())
+  const thread = await getThreadOrFail(store, threadId.toString())
   const actorWorker = await getActorWorker(store, privilegedActor)
 
   const threadMovedEvent = new ThreadMovedEvent({
@@ -436,7 +418,7 @@ export async function forum_ThreadMoved({ event, store }: EventContext & StoreCo
 export async function forum_PostAdded({ event, store }: EventContext & StoreContext): Promise<void> {
   const [postId, forumUserId, , threadId, metadataBytes, isEditable] = new PostAddedEvent_V1001(event).params
 
-  const thread = await getThread(store, threadId.toString())
+  const thread = await getThreadOrFail(store, threadId.toString())
   const metadata = deserializeMetadata(ForumPostMetadata, metadataBytes)
   const postText = metadata ? metadata.text || '' : bytesToString(metadataBytes)
   const repliesToPost =
@@ -512,8 +494,8 @@ export async function forum_CategoryMembershipOfModeratorUpdated({
   event,
 }: EventContext & StoreContext): Promise<void> {
   const [moderatorId, categoryId, canModerate] = new CategoryMembershipOfModeratorUpdatedEvent_V1001(event).params
-  const moderator = await getWorker(store, 'forumWorkingGroup', moderatorId.toNumber())
-  const category = await getCategory(store, categoryId.toString(), ['moderators'])
+  const moderator = await getWorkerOrFail(store, 'forumWorkingGroup', moderatorId.toNumber())
+  const category = await getCategoryOrFail(store, categoryId.toString(), ['moderators'])
 
   if (canModerate.valueOf()) {
     category.moderators.push(moderator)
@@ -535,12 +517,13 @@ export async function forum_CategoryMembershipOfModeratorUpdated({
 export async function forum_PostModerated({ event, store }: EventContext & StoreContext): Promise<void> {
   const [postId, rationaleBytes, privilegedActor] = new PostModeratedEvent_V1001(event).params
   const actorWorker = await getActorWorker(store, privilegedActor)
-  await moderatePost(store, event, 'runtime', postId.toString(), actorWorker, bytesToString(rationaleBytes))
+  const post = await getPostOrFail(store, postId.toString())
+  await moderatePost(store, event, 'runtime', post, actorWorker, bytesToString(rationaleBytes))
 }
 
 export async function forum_PostTextUpdated({ event, store }: EventContext & StoreContext): Promise<void> {
   const [postId, , , , newTextBytes] = new PostTextUpdatedEvent_V1001(event).params
-  const post = await getPost(store, postId.toString())
+  const post = await getPostOrFail(store, postId.toString())
 
   const postTextUpdatedEvent = new PostTextUpdatedEvent({
     ...genericEventFields(event),
@@ -567,7 +550,7 @@ export async function forum_PostDeleted({ event, store }: EventContext & StoreCo
 
   await Promise.all(
     Array.from(postsData.entries()).map(async ([{ postId }, hideFlag]) => {
-      const post = await getPost(store, postId.toString(), ['thread'])
+      const post = await getPostOrFail(store, postId.toString(), ['thread'])
       const newStatus = hideFlag.isTrue ? new PostStatusRemoved() : new PostStatusLocked()
       newStatus.postDeletedEventId = postDeletedEvent.id
       post.status = newStatus
diff --git a/query-node/mappings/src/joystreamUtility.ts b/query-node/mappings/src/joystreamUtility.ts
index c565f66cf8..fae4c2162c 100644
--- a/query-node/mappings/src/joystreamUtility.ts
+++ b/query-node/mappings/src/joystreamUtility.ts
@@ -2,14 +2,14 @@ import { EventContext, StoreContext } from '@joystream/hydra-common'
 import BN from 'bn.js'
 import { BudgetUpdatedEvent, WorkingGroup } from 'query-node/dist/model'
 import { JoystreamUtility_UpdatedWorkingGroupBudgetEvent_V1001 } from '../generated/types'
-import { genericEventFields, getWorkingGroupByName, getWorkingGroupModuleName } from './common'
+import { genericEventFields, getWorkingGroupByNameOrFail, getWorkingGroupModuleName } from './common'
 
 export async function joystreamUtility_UpdatedWorkingGroupBudget({
   store,
   event,
 }: EventContext & StoreContext): Promise<void> {
   const [workingGroup, amount, amountType] = new JoystreamUtility_UpdatedWorkingGroupBudgetEvent_V1001(event).params
-  const group = await getWorkingGroupByName(store, getWorkingGroupModuleName(workingGroup))
+  const group = await getWorkingGroupByNameOrFail(store, getWorkingGroupModuleName(workingGroup))
   const budgetChangeAmount = new BN(amountType.isNegative ? `-${amount.toString()}` : amount.toString())
   group.budget = group.budget.add(budgetChangeAmount)
   await store.save<WorkingGroup>(group)
diff --git a/query-node/mappings/src/membership.ts b/query-node/mappings/src/membership.ts
index bed1f8acd9..d4f9e17c31 100644
--- a/query-node/mappings/src/membership.ts
+++ b/query-node/mappings/src/membership.ts
@@ -16,7 +16,10 @@ import {
 } from '@polkadot/types/lookup'
 import BN from 'bn.js'
 import {
+  App,
   AvatarUri,
+  ChannelPaymentMadeEvent,
+  Comment,
   InitialInvitationBalanceUpdatedEvent,
   InitialInvitationCountUpdatedEvent,
   InvitesTransferredEvent,
@@ -68,18 +71,18 @@ import {
 } from '../generated/types'
 import { membershipConfig } from './bootstrap-data'
 import {
+  MetaprotocolTxError,
+  RelationsArr,
   bytesToString,
   deserializeMetadata,
   genericEventFields,
-  getMemberById,
-  getWorker,
-  getWorkingGroupByName,
+  getMembershipById,
+  getWorkerOrFail,
+  getWorkingGroupByNameOrFail,
   invalidMetadata,
-  logger,
   saveMetaprotocolTransactionErrored,
   saveMetaprotocolTransactionSuccessful,
   toNumber,
-  unexpectedData,
 } from './common'
 import {
   processChannelPaymentFromMember,
@@ -90,7 +93,7 @@ import {
   processReactVideoMessage,
 } from './content'
 import { processCreateAppMessage, processUpdateAppMessage } from './content/app'
-import { createVideoCategory } from './content/videoCategory'
+import { processCreateVideoCategoryMessage } from './content/videoCategory'
 
 // Will only be used to get the initial balance till ephesus upgrade, after that it will be read from the event
 async function initialInvitationBalance(store: DatabaseManager) {
@@ -324,7 +327,10 @@ export async function members_MemberCreated({ store, event }: EventContext & Sto
 export async function members_MemberProfileUpdated({ store, event }: EventContext & StoreContext): Promise<void> {
   const [memberId, newHandle, newMetadata] = new MemberProfileUpdatedEvent_V1001(event).params
   const metadata = newMetadata.isSome ? deserializeMetadata(MembershipMetadata, newMetadata.unwrap()) : undefined
-  const member = await getMemberById(store, memberId, ['metadata', 'metadata.externalResources'])
+  const member = await getMembershipById(store, memberId, [
+    'metadata',
+    'metadata.externalResources',
+  ] as RelationsArr<Membership>)
 
   // FIXME: https://github.com/Joystream/hydra/issues/435
   if (typeof metadata?.name === 'string') {
@@ -384,7 +390,7 @@ export async function members_MemberProfileUpdated({ store, event }: EventContex
 
 export async function members_MemberAccountsUpdated({ store, event }: EventContext & StoreContext): Promise<void> {
   const [memberId, newRootAccount, newControllerAccount] = new MemberAccountsUpdatedEvent_V1001(event).params
-  const member = await getMemberById(store, memberId)
+  const member = await getMembershipById(store, memberId)
 
   if (newControllerAccount.isSome) {
     member.controllerAccount = newControllerAccount.unwrap().toString()
@@ -410,8 +416,8 @@ export async function members_MemberVerificationStatusUpdated({
   event,
 }: EventContext & StoreContext): Promise<void> {
   const [memberId, verificationStatus, workerId] = new MemberVerificationStatusUpdatedEvent_V1001(event).params
-  const member = await getMemberById(store, memberId)
-  const worker = await getWorker(store, 'membershipWorkingGroup', workerId)
+  const member = await getMembershipById(store, memberId)
+  const worker = await getWorkerOrFail(store, 'membershipWorkingGroup', workerId)
 
   member.isVerified = verificationStatus.valueOf()
 
@@ -429,8 +435,8 @@ export async function members_MemberVerificationStatusUpdated({
 
 export async function members_InvitesTransferred({ store, event }: EventContext & StoreContext): Promise<void> {
   const [sourceMemberId, targetMemberId, numberOfInvites] = new InvitesTransferredEvent_V1001(event).params
-  const sourceMember = await getMemberById(store, sourceMemberId)
-  const targetMember = await getMemberById(store, targetMemberId)
+  const sourceMember = await getMembershipById(store, sourceMemberId)
+  const targetMember = await getMembershipById(store, targetMemberId)
 
   sourceMember.inviteCount -= numberOfInvites.toNumber()
   targetMember.inviteCount += numberOfInvites.toNumber()
@@ -457,12 +463,12 @@ export async function members_MemberInvited({ store, event, block }: EventContex
   const invitedMember = await createNewMemberFromParams(store, memberId, entryMethod, inviteMembershipParameters, 0)
 
   // Decrease invite count of inviting member
-  const invitingMember = await getMemberById(store, inviteMembershipParameters.invitingMemberId)
+  const invitingMember = await getMembershipById(store, inviteMembershipParameters.invitingMemberId)
   invitingMember.inviteCount -= 1
   await store.save<Membership>(invitingMember)
 
   // Decrease working group budget
-  const membershipWg = await getWorkingGroupByName(store, 'membershipWorkingGroup')
+  const membershipWg = await getWorkingGroupByNameOrFail(store, 'membershipWorkingGroup')
   const invitedMemberBalance = maybeInvitedMemberBalance
     ? maybeInvitedMemberBalance.toBn()
     : await initialInvitationBalance(store)
@@ -501,7 +507,7 @@ export async function members_StakingAccountAdded({ store, event }: EventContext
 
 export async function members_StakingAccountConfirmed({ store, event }: EventContext & StoreContext): Promise<void> {
   const [accountId, memberId] = new StakingAccountConfirmedEvent_V1001(event).params
-  const member = await getMemberById(store, memberId)
+  const member = await getMembershipById(store, memberId)
 
   member.boundAccounts.push(accountId.toString())
 
@@ -518,7 +524,7 @@ export async function members_StakingAccountConfirmed({ store, event }: EventCon
 
 export async function members_StakingAccountRemoved({ store, event }: EventContext & StoreContext): Promise<void> {
   const [accountId, memberId] = new StakingAccountRemovedEvent_V1001(event).params
-  const member = await getMemberById(store, memberId)
+  const member = await getMembershipById(store, memberId)
 
   member.boundAccounts.splice(
     member.boundAccounts.findIndex((a) => a === accountId.toString()),
@@ -591,14 +597,10 @@ export async function members_LeaderInvitationQuotaUpdated({
   const [newQuota] = new LeaderInvitationQuotaUpdatedEvent_V1001(event).params
 
   const groupName = 'membershipWorkingGroup'
-  const group = await store.get(WorkingGroup, {
-    where: { name: groupName },
-    relations: ['leader', 'leader.membership'],
-  })
-
-  if (!group) {
-    throw new Error(`Working group ${groupName} not found!`)
-  }
+  const group = await getWorkingGroupByNameOrFail(store, groupName, [
+    'leader',
+    'leader.membership',
+  ] as RelationsArr<WorkingGroup>)
 
   const lead = group.leader!.membership
   lead.inviteCount = toNumber(newQuota)
@@ -619,98 +621,119 @@ export async function members_MemberRemarked(ctx: EventContext & StoreContext):
   const [memberId, metadataBytes, payment] =
     specVersion === 2001 ? new MemberRemarkedEvent_V2001(event).params : new MemberRemarkedEvent_V1001(event).params
 
-  try {
-    const metadata = deserializeMetadata(MemberRemarked, metadataBytes)
-
-    const metaTransactionInfo = await processMemberRemark(ctx, memberId, metadata, payment?.unwrapOr(undefined))
-
-    await saveMetaprotocolTransactionSuccessful(store, event, metaTransactionInfo)
-
-    // emit log event
-    logger.info('Member remarked', { metadata })
-  } catch (error) {
-    // emit log event
-    logger.info(`Bad metadata for member's remark`, { error })
+  const member = await getMembershipById(store, memberId)
+  const metadata = deserializeMetadata(MemberRemarked, metadataBytes)
+  const metaprotocolTxResult = await processMemberRemark(ctx, member, metadata, payment?.unwrapOr(undefined))
 
-    // save metaprotocol info
-    await saveMetaprotocolTransactionErrored(store, event, `Bad metadata for member's remark, error: ${error}}`)
+  if (metaprotocolTxResult instanceof MetaprotocolTransactionSuccessful) {
+    await saveMetaprotocolTransactionSuccessful(store, event, metaprotocolTxResult)
+  } else {
+    await saveMetaprotocolTransactionErrored(store, event, metaprotocolTxResult)
+    invalidMetadata(`Bad metadata for member's remark:`, { metadata, metaprotocolTxResult })
   }
 }
 
 async function processMemberRemark(
   { store, event }: EventContext & StoreContext,
-  memberId: MemberId,
+  member: Membership,
   decodedMetadata: DecodedMetadataObject<IMemberRemarked> | null,
   payment?: [AccountId32, Balance]
-): Promise<Partial<MetaprotocolTransactionSuccessful>> {
+): Promise<MetaprotocolTransactionSuccessful | MetaprotocolTxError> {
+  const metaprotocolTransactionSuccessful = new MetaprotocolTransactionSuccessful()
   if (decodedMetadata?.createApp) {
-    await processCreateAppMessage(store, event, decodedMetadata.createApp, memberId.toString())
+    const appOrError = await processCreateAppMessage(store, event, decodedMetadata.createApp, member)
 
-    return {}
+    if (appOrError instanceof App) {
+      return metaprotocolTransactionSuccessful
+    }
+    return appOrError
   }
 
   if (decodedMetadata?.updateApp) {
-    await processUpdateAppMessage(store, decodedMetadata.updateApp, memberId.toString())
+    const appOrError = await processUpdateAppMessage(store, decodedMetadata.updateApp, member)
 
-    return {}
+    if (appOrError instanceof App) {
+      return metaprotocolTransactionSuccessful
+    }
+    return appOrError
   }
 
   if (decodedMetadata?.reactVideo) {
-    await processReactVideoMessage(store, event, memberId, decodedMetadata.reactVideo)
+    await processReactVideoMessage(store, event, member, decodedMetadata.reactVideo)
 
-    return {}
+    return metaprotocolTransactionSuccessful
   }
 
   if (decodedMetadata?.reactComment) {
-    await processReactCommentMessage(store, event, memberId, decodedMetadata.reactComment)
+    const commentOrError = await processReactCommentMessage(store, event, member, decodedMetadata.reactComment)
 
-    return {}
+    if (commentOrError instanceof Comment) {
+      metaprotocolTransactionSuccessful.commentCreatedId = commentOrError.id
+      return metaprotocolTransactionSuccessful
+    }
+    return commentOrError
   }
 
   if (decodedMetadata?.createComment) {
-    const comment = await processCreateCommentMessage(store, event, memberId, decodedMetadata.createComment)
+    const commentOrError = await processCreateCommentMessage(store, event, member, decodedMetadata.createComment)
 
-    return { commentCreatedId: comment.id }
+    if (commentOrError instanceof Comment) {
+      metaprotocolTransactionSuccessful.commentCreatedId = commentOrError.id
+      return metaprotocolTransactionSuccessful
+    }
+    return commentOrError
   }
 
   if (decodedMetadata?.editComment) {
-    const comment = await processEditCommentMessage(store, event, memberId, decodedMetadata.editComment)
-    return { commentEditedId: comment.id }
+    const commentOrError = await processEditCommentMessage(store, event, member, decodedMetadata.editComment)
+    if (commentOrError instanceof Comment) {
+      metaprotocolTransactionSuccessful.commentEditedId = commentOrError.id
+      return metaprotocolTransactionSuccessful
+    }
+    return commentOrError
   }
 
   if (decodedMetadata?.deleteComment) {
-    const comment = await processDeleteCommentMessage(store, event, memberId, decodedMetadata.deleteComment)
-    return { commentDeletedId: comment.id }
+    const commentOrError = await processDeleteCommentMessage(store, event, member, decodedMetadata.deleteComment)
+
+    if (commentOrError instanceof Comment) {
+      metaprotocolTransactionSuccessful.commentDeletedId = commentOrError.id
+      return metaprotocolTransactionSuccessful
+    }
+    return commentOrError
   }
 
   // Though the payments can be sent along with any arbitrary metadata message type,
   // however they will only be processed if the message type is 'makeChannelPayment'
   if (decodedMetadata?.makeChannelPayment) {
     if (!payment) {
-      unexpectedData(
+      invalidMetadata(
         `payment info should be set when sending remark with 'makeChannelPayment' message type`,
         decodedMetadata
       )
+      return MetaprotocolTxError.InvalidMetadata
     }
 
-    const channelPayment = await processChannelPaymentFromMember(
+    const channelPaymentOrError = await processChannelPaymentFromMember(
       store,
       event,
-      memberId,
+      member,
       decodedMetadata.makeChannelPayment,
       payment
     )
-    return { channelPaidId: channelPayment.payeeChannel?.id }
+
+    if (channelPaymentOrError instanceof ChannelPaymentMadeEvent) {
+      metaprotocolTransactionSuccessful.channelPaidId = channelPaymentOrError.payeeChannel?.id || ''
+      return metaprotocolTransactionSuccessful
+    }
+    return channelPaymentOrError
   }
 
   if (decodedMetadata?.createVideoCategory) {
-    const createParams = decodedMetadata.createVideoCategory
-
-    const videoCategory = await createVideoCategory(store, event, createParams)
-
-    return { videoCategoryCreatedId: videoCategory.id }
+    const videoCategory = await processCreateVideoCategoryMessage(store, event, decodedMetadata.createVideoCategory)
+    metaprotocolTransactionSuccessful.videoCategoryCreatedId = videoCategory.id
+    return metaprotocolTransactionSuccessful
   }
 
-  // unknown message type
-  return unexpectedData('Unsupported message type in member_remark action', decodedMetadata)
+  return MetaprotocolTxError.InvalidMetadata
 }
diff --git a/query-node/mappings/src/proposals.ts b/query-node/mappings/src/proposals.ts
index d8e739050e..9aa81ce0a7 100644
--- a/query-node/mappings/src/proposals.ts
+++ b/query-node/mappings/src/proposals.ts
@@ -1,92 +1,90 @@
 /*
 eslint-disable @typescript-eslint/naming-convention
 */
-import { SubstrateEvent, DatabaseManager, EventContext, StoreContext } from '@joystream/hydra-common'
+import { DatabaseManager, EventContext, StoreContext, SubstrateEvent } from '@joystream/hydra-common'
+import { Bytes } from '@polkadot/types'
 import { PalletProposalsCodexProposalDetails as RuntimeProposalDetails } from '@polkadot/types/lookup'
+import { blake2AsHex } from '@polkadot/util-crypto'
 import BN from 'bn.js'
 import {
-  Proposal,
-  SignalProposalDetails,
-  RuntimeUpgradeProposalDetails,
-  FundingRequestProposalDetails,
-  SetMaxValidatorCountProposalDetails,
-  CreateWorkingGroupLeadOpeningProposalDetails,
-  FillWorkingGroupLeadOpeningProposalDetails,
-  UpdateWorkingGroupBudgetProposalDetails,
-  DecreaseWorkingGroupLeadStakeProposalDetails,
-  SlashWorkingGroupLeadProposalDetails,
-  SetWorkingGroupLeadRewardProposalDetails,
-  TerminateWorkingGroupLeadProposalDetails,
   AmendConstitutionProposalDetails,
   CancelWorkingGroupLeadOpeningProposalDetails,
-  SetMembershipPriceProposalDetails,
-  SetCouncilBudgetIncrementProposalDetails,
-  SetCouncilorRewardProposalDetails,
-  SetInitialInvitationBalanceProposalDetails,
-  SetInitialInvitationCountProposalDetails,
-  SetMembershipLeadInvitationQuotaProposalDetails,
-  SetReferralCutProposalDetails,
-  VetoProposalDetails,
-  ProposalDetails,
-  FundingRequestDestinationsList,
+  CreateWorkingGroupLeadOpeningProposalDetails,
+  DecreaseWorkingGroupLeadStakeProposalDetails,
+  FillWorkingGroupLeadOpeningProposalDetails,
   FundingRequestDestination,
+  FundingRequestDestinationsList,
+  FundingRequestProposalDetails,
   Membership,
-  ProposalStatusDeciding,
-  ProposalIntermediateStatus,
-  ProposalStatusDormant,
-  ProposalStatusGracing,
-  ProposalStatusUpdatedEvent,
+  Proposal,
+  ProposalCancelledEvent,
+  ProposalCreatedEvent,
+  ProposalDecisionMadeEvent,
   ProposalDecisionStatus,
+  ProposalDetails,
+  ProposalDiscussionThread,
+  ProposalDiscussionThreadModeOpen,
+  ProposalExecutedEvent,
+  ProposalExecutionStatus,
+  ProposalIntermediateStatus,
+  ProposalStatus,
+  ProposalStatusCanceledByRuntime,
   ProposalStatusCancelled,
+  ProposalStatusDeciding,
+  ProposalStatusDormant,
+  ProposalStatusExecuted,
+  ProposalStatusExecutionFailed,
   ProposalStatusExpired,
+  ProposalStatusGracing,
   ProposalStatusRejected,
   ProposalStatusSlashed,
+  ProposalStatusUpdatedEvent,
   ProposalStatusVetoed,
-  ProposalDecisionMadeEvent,
-  ProposalStatusCanceledByRuntime,
-  ProposalStatusExecuted,
-  ProposalStatusExecutionFailed,
-  ProposalExecutionStatus,
-  ProposalExecutedEvent,
-  ProposalVotedEvent,
   ProposalVoteKind,
-  ProposalCancelledEvent,
-  ProposalCreatedEvent,
+  ProposalVotedEvent,
+  RuntimeUpgradeProposalDetails,
   RuntimeWasmBytecode,
-  ProposalDiscussionThread,
-  ProposalDiscussionThreadModeOpen,
-  ProposalStatus,
+  SetCouncilBudgetIncrementProposalDetails,
+  SetCouncilorRewardProposalDetails,
+  SetInitialInvitationBalanceProposalDetails,
+  SetInitialInvitationCountProposalDetails,
+  SetMaxValidatorCountProposalDetails,
+  SetMembershipLeadInvitationQuotaProposalDetails,
+  SetMembershipPriceProposalDetails,
+  SetReferralCutProposalDetails,
+  SetWorkingGroupLeadRewardProposalDetails,
+  SignalProposalDetails,
+  SlashWorkingGroupLeadProposalDetails,
+  TerminateWorkingGroupLeadProposalDetails,
   UpdateChannelPayoutsProposalDetails,
+  UpdateGlobalNftLimitProposalDetails,
+  UpdateWorkingGroupBudgetProposalDetails,
+  VetoProposalDetails,
 } from 'query-node/dist/model'
 import {
+  ProposalsEngine_ProposalCancelledEvent_V1001 as ProposalCancelledEvent_V1001,
+  ProposalsCodex_ProposalCreatedEvent_V1001 as ProposalCreatedEvent_V1001,
+  ProposalsEngine_ProposalDecisionMadeEvent_V1001 as ProposalDecisionMadeEvent_V1001,
+  ProposalsEngine_ProposalExecutedEvent_V1001 as ProposalExecutedEvent_V1001,
+  ProposalsEngine_ProposalStatusUpdatedEvent_V1001 as ProposalStatusUpdatedEvent_V1001,
+  ProposalsEngine_VotedEvent_V1001 as ProposalVotedEvent_V1001,
+} from '../generated/types'
+import {
+  INT32MAX,
   asBN,
   bytesToString,
   genericEventFields,
+  getByIdOrFail,
   getWorkingGroupModuleName,
-  INT32MAX,
   toNumber,
+  unimplementedError,
   unwrap,
   whenDef,
 } from './common'
-import {
-  ProposalsCodex_ProposalCreatedEvent_V1001 as ProposalCreatedEvent_V1001,
-  ProposalsEngine_ProposalCancelledEvent_V1001 as ProposalCancelledEvent_V1001,
-  ProposalsEngine_ProposalDecisionMadeEvent_V1001 as ProposalDecisionMadeEvent_V1001,
-  ProposalsEngine_ProposalExecutedEvent_V1001 as ProposalExecutedEvent_V1001,
-  ProposalsEngine_ProposalStatusUpdatedEvent_V1001 as ProposalStatusUpdatedEvent_V1001,
-  ProposalsEngine_VotedEvent_V1001 as ProposalVotedEvent_V1001,
-} from '../generated/types'
 import { createWorkingGroupOpeningMetadata } from './workingGroups'
-import { blake2AsHex } from '@polkadot/util-crypto'
-import { Bytes } from '@polkadot/types'
 
 async function getProposal(store: DatabaseManager, id: string) {
-  const proposal = await store.get(Proposal, { where: { id } })
-  if (!proposal) {
-    throw new Error(`Proposal not found by id: ${id}`)
-  }
-
-  return proposal
+  return getByIdOrFail(store, Proposal, id)
 }
 
 async function getOrCreateRuntimeWasmBytecode(store: DatabaseManager, bytecode: Bytes) {
@@ -301,9 +299,20 @@ async function parseProposalDetails(
     const asPayload = unwrap(specificDetails.payload)?.objectCreationParams
     details.payloadHash = asPayload && bytesToString(asPayload.ipfsContentId)
 
+    return details
+  }
+  // UpdateGlobalNftLimitProposalDetails
+  else if (proposalDetails.isUpdateGlobalNftLimit) {
+    const details = new UpdateGlobalNftLimitProposalDetails()
+    const specificDetails = proposalDetails.asUpdateGlobalNftLimit
+    if (specificDetails[0].isDaily) {
+      details.newDailyNftLimit = specificDetails[1].toNumber()
+    } else {
+      details.newWeeklyNftLimit = specificDetails[1].toNumber()
+    }
     return details
   } else {
-    throw new Error(`Unspported proposal details type: ${proposalDetails.type}`)
+    unimplementedError(`Unsupported proposal details type: ${proposalDetails.type}`)
   }
 }
 
@@ -389,7 +398,7 @@ export async function proposalsEngine_ProposalStatusUpdated({
     newStatus = new ProposalStatusGracing()
     ++proposal.councilApprovals
   } else {
-    throw new Error(`Unexpected proposal status: ${status.type}`)
+    unimplementedError(`Unsupported proposal status: ${status.type}`)
   }
 
   const proposalStatusUpdatedEvent = new ProposalStatusUpdatedEvent({
@@ -431,7 +440,7 @@ export async function proposalsEngine_ProposalDecisionMade({
   } else if (decision.isVetoed) {
     decisionStatus = new ProposalStatusVetoed()
   } else {
-    throw new Error(`Unexpected proposal decision: ${decision.type}`)
+    unimplementedError(`Unexpected proposal decision: ${decision.type}`)
   }
 
   const proposalDecisionMadeEvent = new ProposalDecisionMadeEvent({
@@ -475,7 +484,7 @@ export async function proposalsEngine_ProposalExecuted({ store, event }: EventCo
     status.errorMessage = executionStatus.asExecutionFailed.error.toHuman() as string
     newStatus = status
   } else {
-    throw new Error(`Unexpected proposal execution status: ${executionStatus.type}`)
+    unimplementedError(`Unsupported proposal execution status: ${executionStatus.type}`)
   }
 
   const proposalExecutedEvent = new ProposalExecutedEvent({
@@ -507,10 +516,8 @@ export async function proposalsEngine_Voted({ store, event }: EventContext & Sto
     vote = ProposalVoteKind.REJECT
   } else if (voteKind.isSlash) {
     vote = ProposalVoteKind.SLASH
-  } else if (voteKind.isAbstain) {
-    vote = ProposalVoteKind.ABSTAIN
   } else {
-    throw new Error(`Unexpected vote kind: ${voteKind.type}`)
+    vote = ProposalVoteKind.ABSTAIN
   }
 
   const votedEvent = new ProposalVotedEvent({
diff --git a/query-node/mappings/src/proposalsDiscussion.ts b/query-node/mappings/src/proposalsDiscussion.ts
index d5589a39a5..fb87d610d2 100644
--- a/query-node/mappings/src/proposalsDiscussion.ts
+++ b/query-node/mappings/src/proposalsDiscussion.ts
@@ -1,48 +1,38 @@
 /*
 eslint-disable @typescript-eslint/naming-convention
 */
-import { EventContext, StoreContext, DatabaseManager } from '@joystream/hydra-common'
+import { DatabaseManager, EventContext, StoreContext } from '@joystream/hydra-common'
+import { ProposalsDiscussionPostMetadata } from '@joystream/metadata-protobuf'
 import {
   Membership,
-  ProposalDiscussionPostStatusActive,
-  ProposalDiscussionPostStatusLocked,
   ProposalDiscussionPost,
-  ProposalDiscussionThread,
   ProposalDiscussionPostCreatedEvent,
+  ProposalDiscussionPostDeletedEvent,
+  ProposalDiscussionPostStatusActive,
+  ProposalDiscussionPostStatusLocked,
+  ProposalDiscussionPostStatusRemoved,
   ProposalDiscussionPostUpdatedEvent,
+  ProposalDiscussionThread,
+  ProposalDiscussionThreadModeChangedEvent,
   ProposalDiscussionThreadModeClosed,
-  ProposalDiscussionWhitelist,
   ProposalDiscussionThreadModeOpen,
-  ProposalDiscussionThreadModeChangedEvent,
-  ProposalDiscussionPostDeletedEvent,
-  ProposalDiscussionPostStatusRemoved,
+  ProposalDiscussionWhitelist,
 } from 'query-node/dist/model'
-import { bytesToString, deserializeMetadata, genericEventFields } from './common'
+import { In } from 'typeorm'
 import {
   ProposalsDiscussion_PostCreatedEvent_V1001 as PostCreatedEvent_V1001,
   ProposalsDiscussion_PostDeletedEvent_V1001 as PostDeletedEvent_V1001,
   ProposalsDiscussion_PostUpdatedEvent_V1001 as PostUpdatedEvent_V1001,
   ProposalsDiscussion_ThreadModeChangedEvent_V1001 as ThreadModeChangedEvent_V1001,
 } from '../generated/types'
-import { ProposalsDiscussionPostMetadata } from '@joystream/metadata-protobuf'
-import { In } from 'typeorm'
+import { bytesToString, deserializeMetadata, genericEventFields, getByIdOrFail, unimplementedError } from './common'
 
 async function getPost(store: DatabaseManager, id: string) {
-  const post = await store.get(ProposalDiscussionPost, { where: { id } })
-  if (!post) {
-    throw new Error(`Proposal discussion post not found by id: ${id}`)
-  }
-
-  return post
+  return getByIdOrFail(store, ProposalDiscussionPost, id)
 }
 
 async function getThread(store: DatabaseManager, id: string) {
-  const thread = await store.get(ProposalDiscussionThread, { where: { id } })
-  if (!thread) {
-    throw new Error(`Proposal discussion thread not found by id: ${id}`)
-  }
-
-  return thread
+  return getByIdOrFail(store, ProposalDiscussionThread, id)
 }
 
 export async function proposalsDiscussion_PostCreated({ event, store }: EventContext & StoreContext): Promise<void> {
@@ -117,7 +107,7 @@ export async function proposalsDiscussion_ThreadModeChanged({
     const newMode = new ProposalDiscussionThreadModeOpen()
     thread.mode = newMode
   } else {
-    throw new Error(`Unrecognized proposal thread mode: ${threadMode.type}`)
+    unimplementedError(`Unsupported thread mode: ${threadMode}`)
   }
 
   await store.save<ProposalDiscussionThread>(thread)
diff --git a/query-node/mappings/src/storage/index.ts b/query-node/mappings/src/storage/index.ts
index 83810abba0..9f5224b58e 100644
--- a/query-node/mappings/src/storage/index.ts
+++ b/query-node/mappings/src/storage/index.ts
@@ -50,7 +50,7 @@ import {
   Storage_StorageOperatorMetadataSetEvent_V1001 as StorageOperatorMetadataSetEvent_V1001,
   Storage_VoucherChangedEvent_V1001 as VoucherChangedEvent_V1001,
 } from '../../generated/types'
-import { getById, inconsistentState } from '../common'
+import { RelationsArr, getById, getByIdOrFail } from '../common'
 import { unsetAssetRelations, videoRelationsForCounters } from '../content/utils'
 import { getAllManagers } from '../derivedPropertiesManager/applications'
 import {
@@ -66,12 +66,10 @@ import {
   distributionOperatorId,
   getBag,
   getDataObjectsInBag,
-  getDistributionBucketFamilyWithMetadata,
   getDistributionBucketOperatorWithMetadata,
   getDynamicBag,
   getDynamicBagId,
   getDynamicBagOwner,
-  getStorageBucketWithOperatorMetadata,
 } from './utils'
 
 // STORAGE BUCKETS
@@ -100,7 +98,11 @@ export async function storage_StorageBucketCreated({ event, store }: EventContex
 
 export async function storage_StorageOperatorMetadataSet({ event, store }: EventContext & StoreContext): Promise<void> {
   const [bucketId, , metadataBytes] = new StorageOperatorMetadataSetEvent_V1001(event).params
-  const storageBucket = await getStorageBucketWithOperatorMetadata(store, bucketId.toString())
+  const storageBucket = await getByIdOrFail(store, StorageBucket, bucketId.toString(), [
+    'operatorMetadata',
+    'operatorMetadata.nodeLocation',
+    'operatorMetadata.nodeLocation.coordinates',
+  ] as RelationsArr<StorageBucket>)
   storageBucket.operatorMetadata = await processStorageOperatorMetadata(
     event,
     store,
@@ -113,7 +115,7 @@ export async function storage_StorageOperatorMetadataSet({ event, store }: Event
 export async function storage_StorageBucketStatusUpdated({ event, store }: EventContext & StoreContext): Promise<void> {
   const [bucketId, acceptingNewBags] = new StorageBucketStatusUpdatedEvent_V1001(event).params
 
-  const storageBucket = await getById(store, StorageBucket, bucketId.toString())
+  const storageBucket = await getByIdOrFail(store, StorageBucket, bucketId.toString())
   storageBucket.acceptingNewBags = acceptingNewBags.isTrue
   await store.save<StorageBucket>(storageBucket)
 }
@@ -123,7 +125,7 @@ export async function storage_StorageBucketInvitationAccepted({
   store,
 }: EventContext & StoreContext): Promise<void> {
   const [bucketId, workerId, transactorAccountId] = new StorageBucketInvitationAcceptedEvent_V1001(event).params
-  const storageBucket = await getById(store, StorageBucket, bucketId.toString())
+  const storageBucket = await getByIdOrFail(store, StorageBucket, bucketId.toString())
   const operatorStatus = new StorageBucketOperatorStatusActive()
   operatorStatus.workerId = workerId.toNumber()
   operatorStatus.transactorAccountId = transactorAccountId.toString()
@@ -136,7 +138,7 @@ export async function storage_StorageBucketInvitationCancelled({
   store,
 }: EventContext & StoreContext): Promise<void> {
   const [bucketId] = new StorageBucketInvitationCancelledEvent_V1001(event).params
-  const storageBucket = await getById(store, StorageBucket, bucketId.toString())
+  const storageBucket = await getByIdOrFail(store, StorageBucket, bucketId.toString())
   const operatorStatus = new StorageBucketOperatorStatusMissing()
   storageBucket.operatorStatus = operatorStatus
   await store.save<StorageBucket>(storageBucket)
@@ -147,7 +149,7 @@ export async function storage_StorageBucketOperatorInvited({
   store,
 }: EventContext & StoreContext): Promise<void> {
   const [bucketId, workerId] = new StorageBucketOperatorInvitedEvent_V1001(event).params
-  const storageBucket = await getById(store, StorageBucket, bucketId.toString())
+  const storageBucket = await getByIdOrFail(store, StorageBucket, bucketId.toString())
   const operatorStatus = new StorageBucketOperatorStatusInvited()
   operatorStatus.workerId = workerId.toNumber()
   storageBucket.operatorStatus = operatorStatus
@@ -159,7 +161,7 @@ export async function storage_StorageBucketOperatorRemoved({
   store,
 }: EventContext & StoreContext): Promise<void> {
   const [bucketId] = new StorageBucketInvitationCancelledEvent_V1001(event).params
-  const storageBucket = await getById(store, StorageBucket, bucketId.toString())
+  const storageBucket = await getByIdOrFail(store, StorageBucket, bucketId.toString())
   const operatorStatus = new StorageBucketOperatorStatusMissing()
   storageBucket.operatorStatus = operatorStatus
   await store.save<StorageBucket>(storageBucket)
@@ -182,7 +184,7 @@ export async function storage_StorageBucketsUpdatedForBag({
 
 export async function storage_VoucherChanged({ event, store }: EventContext & StoreContext): Promise<void> {
   const [bucketId, voucher] = new VoucherChangedEvent_V1001(event).params
-  const bucket = await getById(store, StorageBucket, bucketId.toString())
+  const bucket = await getByIdOrFail(store, StorageBucket, bucketId.toString())
 
   bucket.dataObjectCountLimit = voucher.objectsLimit
   bucket.dataObjectsSizeLimit = voucher.sizeLimit
@@ -197,7 +199,7 @@ export async function storage_StorageBucketVoucherLimitsSet({
   store,
 }: EventContext & StoreContext): Promise<void> {
   const [bucketId, sizeLimit, countLimit] = new StorageBucketVoucherLimitsSetEvent_V1001(event).params
-  const bucket = await getById(store, StorageBucket, bucketId.toString())
+  const bucket = await getByIdOrFail(store, StorageBucket, bucketId.toString())
   bucket.dataObjectsSizeLimit = sizeLimit
   bucket.dataObjectCountLimit = countLimit
 
@@ -206,14 +208,11 @@ export async function storage_StorageBucketVoucherLimitsSet({
 
 export async function storage_StorageBucketDeleted({ event, store }: EventContext & StoreContext): Promise<void> {
   const [bucketId] = new StorageBucketDeletedEvent_V1001(event).params
-  // TODO: Cascade remove on db level (would require changes in Hydra / comitting autogenerated files)
-  const storageBucket = await store.get(StorageBucket, {
-    where: { id: bucketId.toString() },
-    relations: ['bags', 'bags.storageBuckets'],
-  })
-  if (!storageBucket) {
-    inconsistentState(`Storage bucket by id ${bucketId.toString()} not found!`)
-  }
+  const storageBucket = await getByIdOrFail(store, StorageBucket, bucketId.toString(), [
+    'bags',
+    'bags.storageBuckets',
+  ] as RelationsArr<StorageBucket>)
+
   // Remove relations
   await Promise.all(
     (storageBucket.bags || []).map((bag) => {
@@ -409,7 +408,10 @@ export async function storage_DistributionBucketFamilyMetadataSet({
 }: EventContext & StoreContext): Promise<void> {
   const [familyId, metadataBytes] = new DistributionBucketFamilyMetadataSetEvent_V1001(event).params
 
-  const family = await getDistributionBucketFamilyWithMetadata(store, familyId.toString())
+  const family = await getByIdOrFail(store, DistributionBucketFamily, familyId.toString(), [
+    'metadata',
+    'metadata.areas',
+  ] as RelationsArr<DistributionBucketFamily>)
   family.metadata = await processDistributionBucketFamilyMetadata(event, store, family.metadata, metadataBytes)
 
   await store.save<DistributionBucketFamily>(family)
@@ -449,7 +451,7 @@ export async function storage_DistributionBucketStatusUpdated({
 }: EventContext & StoreContext): Promise<void> {
   const [bucketId, acceptingNewBags] = new DistributionBucketStatusUpdatedEvent_V1001(event).params
 
-  const bucket = await getById(store, DistributionBucket, distributionBucketId(bucketId))
+  const bucket = await getByIdOrFail(store, DistributionBucket, distributionBucketId(bucketId))
   bucket.acceptingNewBags = acceptingNewBags.valueOf()
 
   await store.save<DistributionBucket>(bucket)
@@ -458,13 +460,11 @@ export async function storage_DistributionBucketStatusUpdated({
 export async function storage_DistributionBucketDeleted({ event, store }: EventContext & StoreContext): Promise<void> {
   const [bucketId] = new DistributionBucketDeletedEvent_V1001(event).params
   // TODO: Cascade remove on db level (would require changes in Hydra / comitting autogenerated files)
-  const distributionBucket = await store.get(DistributionBucket, {
-    where: { id: distributionBucketId(bucketId) },
-    relations: ['bags', 'bags.distributionBuckets'],
-  })
-  if (!distributionBucket) {
-    inconsistentState(`Distribution bucket by id ${distributionBucketId(bucketId)} not found!`)
-  }
+  const distributionBucket = await getByIdOrFail(store, DistributionBucket, distributionBucketId(bucketId), [
+    'bags',
+    'bags.distributionBuckets',
+  ] as RelationsArr<DistributionBucket>)
+
   // Remove relations
   await Promise.all(
     (distributionBucket.bags || []).map((bag) => {
@@ -513,7 +513,7 @@ export async function storage_DistributionBucketModeUpdated({
 }: EventContext & StoreContext): Promise<void> {
   const [bucketId, distributing] = new DistributionBucketModeUpdatedEvent_V1001(event).params
 
-  const bucket = await getById(store, DistributionBucket, distributionBucketId(bucketId))
+  const bucket = await getByIdOrFail(store, DistributionBucket, distributionBucketId(bucketId))
   bucket.distributing = distributing.valueOf()
 
   await store.save<DistributionBucket>(bucket)
@@ -542,7 +542,11 @@ export async function storage_DistributionBucketInvitationCancelled({
 }: EventContext & StoreContext): Promise<void> {
   const [bucketId, workerId] = new DistributionBucketInvitationCancelledEvent_V1001(event).params
 
-  const invitedOperator = await getById(store, DistributionBucketOperator, distributionOperatorId(bucketId, workerId))
+  const invitedOperator = await getByIdOrFail(
+    store,
+    DistributionBucketOperator,
+    distributionOperatorId(bucketId, workerId)
+  )
 
   await store.remove<DistributionBucketOperator>(invitedOperator)
 }
@@ -553,7 +557,11 @@ export async function storage_DistributionBucketInvitationAccepted({
 }: EventContext & StoreContext): Promise<void> {
   const [workerId, bucketId] = new DistributionBucketInvitationAcceptedEvent_V1001(event).params
 
-  const invitedOperator = await getById(store, DistributionBucketOperator, distributionOperatorId(bucketId, workerId))
+  const invitedOperator = await getByIdOrFail(
+    store,
+    DistributionBucketOperator,
+    distributionOperatorId(bucketId, workerId)
+  )
   invitedOperator.status = DistributionBucketOperatorStatus.ACTIVE
 
   await store.save<DistributionBucketOperator>(invitedOperator)
diff --git a/query-node/mappings/src/storage/utils.ts b/query-node/mappings/src/storage/utils.ts
index a839fd0d07..3833dccfc1 100644
--- a/query-node/mappings/src/storage/utils.ts
+++ b/query-node/mappings/src/storage/utils.ts
@@ -9,7 +9,6 @@ import {
 import BN from 'bn.js'
 import {
   DataObjectTypeUnknown,
-  DistributionBucketFamily,
   DistributionBucketOperator,
   StorageBag,
   StorageBagOwner,
@@ -17,12 +16,9 @@ import {
   StorageBagOwnerCouncil,
   StorageBagOwnerMember,
   StorageBagOwnerWorkingGroup,
-  StorageBucket,
   StorageDataObject,
 } from 'query-node/dist/model'
-import { In } from 'typeorm'
-import { RelationsArr, bytesToString, getById, inconsistentState } from '../common'
-
+import { RelationsArr, bytesToString, getByIdOrFail, getManyByOrFail } from '../common'
 import {
   DataObjectId,
   DistributionBucketFamilyId,
@@ -31,7 +27,6 @@ import {
 } from '@joystream/types/primitives'
 import { BTreeSet } from '@polkadot/types'
 import { Balance } from '@polkadot/types/interfaces'
-import _ from 'lodash'
 import { unsetAssetRelations, videoRelationsForCounters } from '../content/utils'
 import { getAllManagers } from '../derivedPropertiesManager/applications'
 
@@ -48,53 +43,35 @@ export async function getDataObjectsInBag(
   dataObjectIds: BTreeSet<DataObjectId>,
   relations: string[] = []
 ): Promise<StorageDataObject[]> {
-  const dataObjects = await store.getMany(StorageDataObject, {
-    where: {
-      id: In(Array.from(dataObjectIds).map((id) => id.toString())),
-      storageBag: { id: getBagId(bagId) },
-    },
-    relations,
-  })
-  if (dataObjects.length !== Array.from(dataObjectIds).length) {
-    inconsistentState(
-      `Missing data objects: ${_.difference(
-        Array.from(dataObjectIds).map((id) => id.toString()),
-        dataObjects.map((o) => o.id)
-      )} in bag ${getBagId(bagId)}`
-    )
-  }
-  return dataObjects
+  return getManyByOrFail(
+    store,
+    StorageDataObject,
+    [...dataObjectIds].map((id) => id.toString()),
+    { storageBag: { id: getBagId(bagId) } },
+    relations as RelationsArr<StorageDataObject>,
+    `Missing data objects in bag ${getBagId(bagId)}`
+  )
 }
 
 export async function getSortedDataObjectsByIds(
   store: DatabaseManager,
   dataObjectIds: BTreeSet<DataObjectId>
 ): Promise<StorageDataObject[]> {
-  const dataObjects = await store.getMany(StorageDataObject, {
-    where: {
-      id: In(Array.from(dataObjectIds).map((id) => id.toString())),
-    },
-  })
-  if (dataObjects.length !== Array.from(dataObjectIds).length) {
-    inconsistentState(
-      `Missing data objects: ${_.difference(
-        Array.from(dataObjectIds).map((id) => id.toString()),
-        dataObjects.map((o) => o.id)
-      )}`
-    )
-  }
+  const dataObjects = await getManyByOrFail(
+    store,
+    StorageDataObject,
+    [...dataObjectIds].map((id) => id.toString())
+  )
   return dataObjects.sort((a, b) => parseInt(a.id) - parseInt(b.id))
 }
 
 export function getStaticBagOwner(bagId: StaticBagId): typeof StorageBagOwner {
   if (bagId.isCouncil) {
     return new StorageBagOwnerCouncil()
-  } else if (bagId.isWorkingGroup) {
+  } else {
     const owner = new StorageBagOwnerWorkingGroup()
     owner.workingGroupId = bagId.asWorkingGroup.toString().toLowerCase()
     return owner
-  } else {
-    throw new Error(`Unexpected static bag type: ${bagId.type}`)
   }
 }
 
@@ -103,33 +80,21 @@ export function getDynamicBagOwner(bagId: DynamicBagId): typeof StorageBagOwner
     const owner = new StorageBagOwnerChannel()
     owner.channelId = bagId.asChannel.toNumber()
     return owner
-  } else if (bagId.isMember) {
+  } else {
     const owner = new StorageBagOwnerMember()
     owner.memberId = bagId.asMember.toNumber()
     return owner
-  } else {
-    throw new Error(`Unexpected dynamic bag type: ${bagId.type}`)
   }
 }
 
 export function getStaticBagId(bagId: StaticBagId): string {
-  if (bagId.isCouncil) {
-    return `static:council`
-  } else if (bagId.isWorkingGroup) {
-    return `static:wg:${bagId.asWorkingGroup.type.toLowerCase()}`
-  } else {
-    throw new Error(`Unexpected static bag type: ${bagId.type}`)
-  }
+  return bagId.isCouncil ? `static:council` : `static:wg:${bagId.asWorkingGroup.type.toLowerCase()}`
 }
 
 export function getDynamicBagId(bagId: DynamicBagId): string {
-  if (bagId.isChannel) {
-    return `dynamic:channel:${bagId.asChannel.toString()}`
-  } else if (bagId.isMember) {
-    return `dynamic:member:${bagId.asMember.toString()}`
-  } else {
-    throw new Error(`Unexpected dynamic bag type: ${bagId.type}`)
-  }
+  return bagId.isChannel
+    ? `dynamic:channel:${bagId.asChannel.toString()}`
+    : `dynamic:member:${bagId.asMember.toString()}`
 }
 
 export function getBagId(bagId: BagId): string {
@@ -141,7 +106,7 @@ export async function getDynamicBag(
   bagId: DynamicBagId,
   relations?: RelationsArr<StorageBag>
 ): Promise<StorageBag> {
-  return getById(store, StorageBag, getDynamicBagId(bagId), relations)
+  return getByIdOrFail(store, StorageBag, getDynamicBagId(bagId), relations)
 }
 
 export async function getStaticBag(
@@ -178,39 +143,11 @@ export async function getDistributionBucketOperatorWithMetadata(
   store: DatabaseManager,
   id: string
 ): Promise<DistributionBucketOperator> {
-  const operator = await store.get(DistributionBucketOperator, {
-    where: { id },
-    relations: ['metadata', 'metadata.nodeLocation', 'metadata.nodeLocation.coordinates'],
-  })
-  if (!operator) {
-    throw new Error(`DistributionBucketOperator not found by id: ${id}`)
-  }
-  return operator
-}
-
-export async function getStorageBucketWithOperatorMetadata(store: DatabaseManager, id: string): Promise<StorageBucket> {
-  const bucket = await store.get(StorageBucket, {
-    where: { id },
-    relations: ['operatorMetadata', 'operatorMetadata.nodeLocation', 'operatorMetadata.nodeLocation.coordinates'],
-  })
-  if (!bucket) {
-    throw new Error(`StorageBucket not found by id: ${id}`)
-  }
-  return bucket
-}
-
-export async function getDistributionBucketFamilyWithMetadata(
-  store: DatabaseManager,
-  id: string
-): Promise<DistributionBucketFamily> {
-  const family = await store.get(DistributionBucketFamily, {
-    where: { id },
-    relations: ['metadata', 'metadata.areas'],
-  })
-  if (!family) {
-    throw new Error(`DistributionBucketFamily not found by id: ${id}`)
-  }
-  return family
+  return getByIdOrFail(store, DistributionBucketOperator, id, [
+    'metadata',
+    'metadata.nodeLocation',
+    'metadata.nodeLocation.coordinates',
+  ] as RelationsArr<DistributionBucketOperator>)
 }
 
 export async function createDataObjects(
diff --git a/query-node/mappings/src/workingGroups.ts b/query-node/mappings/src/workingGroups.ts
index 4e3b441c0b..bec490e9b7 100644
--- a/query-node/mappings/src/workingGroups.ts
+++ b/query-node/mappings/src/workingGroups.ts
@@ -1,32 +1,8 @@
 /*
 eslint-disable @typescript-eslint/naming-convention
 */
-import { EventContext, StoreContext, DatabaseManager, SubstrateEvent, FindOneOptions } from '@joystream/hydra-common'
+import { DatabaseManager, EventContext, FindOneOptions, StoreContext, SubstrateEvent } from '@joystream/hydra-common'
 
-import {
-  StorageWorkingGroup_BudgetSetEvent_V1001,
-  StorageWorkingGroup_WorkerRewardAmountUpdatedEvent_V1001 as WorkingGroup_WorkerRewardAmountUpdatedEvent_V1001,
-  StorageWorkingGroup_ApplicationWithdrawnEvent_V1001 as WorkingGroup_ApplicationWithdrawnEvent_V1001,
-  StorageWorkingGroup_AppliedOnOpeningEvent_V1001 as WorkingGroup_AppliedOnOpeningEvent_V1001,
-  StorageWorkingGroup_BudgetSpendingEvent_V1001 as WorkingGroup_BudgetSpendingEvent_V1001,
-  StorageWorkingGroup_LeadRemarkedEvent_V1001 as WorkingGroup_LeadRemarkedEvent_V1001,
-  StorageWorkingGroup_NewMissedRewardLevelReachedEvent_V1001 as WorkingGroup_NewMissedRewardLevelReachedEvent_V1001,
-  StorageWorkingGroup_OpeningAddedEvent_V1001 as WorkingGroup_OpeningAddedEvent_V1001,
-  StorageWorkingGroup_OpeningCanceledEvent_V1001 as WorkingGroup_OpeningCanceledEvent_V1001,
-  StorageWorkingGroup_OpeningFilledEvent_V1001 as WorkingGroup_OpeningFilledEvent_V1001,
-  StorageWorkingGroup_RewardPaidEvent_V1001 as WorkingGroup_RewardPaidEvent_V1001,
-  StorageWorkingGroup_StakeDecreasedEvent_V1001 as WorkingGroup_StakeDecreasedEvent_V1001,
-  StorageWorkingGroup_StakeIncreasedEvent_V1001 as WorkingGroup_StakeIncreasedEvent_V1001,
-  StorageWorkingGroup_StakeSlashedEvent_V1001 as WorkingGroup_StakeSlashedEvent_V1001,
-  StorageWorkingGroup_StatusTextChangedEvent_V1001 as WorkingGroup_StatusTextChangedEvent_V1001,
-  StorageWorkingGroup_TerminatedWorkerEvent_V1001 as WorkingGroup_TerminatedWorkerEvent_V1001,
-  StorageWorkingGroup_WorkerExitedEvent_V1001 as WorkingGroup_WorkerExitedEvent_V1001,
-  StorageWorkingGroup_WorkerRemarkedEvent_V1001 as WorkingGroup_WorkerRemarkedEvent_V1001,
-  StorageWorkingGroup_WorkerRewardAccountUpdatedEvent_V1001 as WorkingGroup_WorkerRewardAccountUpdatedEvent_V1001,
-  StorageWorkingGroup_WorkerRoleAccountUpdatedEvent_V1001 as WorkingGroup_WorkerRoleAccountUpdatedEvent_V1001,
-  StorageWorkingGroup_WorkerStartedLeavingEvent_V1001 as WorkingGroup_WorkerStartedLeavingEvent_V1001,
-  StorageWorkingGroup_WorkingGroupBudgetFundedEvent_V1001 as WorkingGroup_WorkingGroupBudgetFundedEvent_V1001,
-} from '../generated/types'
 import {
   ApplicationMetadata,
   IAddUpcomingOpening,
@@ -39,131 +15,149 @@ import {
   RemarkMetadataAction,
   WorkingGroupMetadataAction,
 } from '@joystream/metadata-protobuf'
+import { DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
+import { isSet } from '@joystream/metadata-protobuf/utils'
+import { createType } from '@joystream/types'
 import { Bytes } from '@polkadot/types'
-import {
-  deserializeMetadata,
-  bytesToString,
-  genericEventFields,
-  getWorker,
-  WorkingGroupModuleName,
-  toNumber,
-  INT32MAX,
-  inconsistentState,
-  getWorkingGroupByName,
-  getWorkingGroupLead,
-  invalidMetadata,
-} from './common'
 import BN from 'bn.js'
 import {
-  WorkingGroupOpening,
-  OpeningAddedEvent,
-  WorkingGroup,
-  WorkingGroupOpeningMetadata,
   ApplicationFormQuestion,
-  ApplicationFormQuestionType,
-  OpeningStatusOpen,
-  WorkingGroupOpeningType,
-  WorkingGroupApplication,
   ApplicationFormQuestionAnswer,
-  AppliedOnOpeningEvent,
-  Membership,
-  ApplicationStatusPending,
+  ApplicationFormQuestionType,
   ApplicationStatusAccepted,
+  ApplicationStatusCancelled,
+  ApplicationStatusPending,
   ApplicationStatusRejected,
-  Worker,
-  WorkerStatusActive,
-  OpeningFilledEvent,
-  OpeningStatusFilled,
+  ApplicationStatusWithdrawn,
+  ApplicationWithdrawnEvent,
+  AppliedOnOpeningEvent,
+  BudgetFundedEvent,
+  BudgetSetEvent,
+  BudgetSpendingEvent,
+  ForumPost,
+  InvalidActionMetadata,
+  LeaderSetEvent,
+  LeaderUnsetEvent,
+  Membership,
+  NewMissedRewardLevelReachedEvent,
+  OpeningAddedEvent,
   // LeaderSetEvent,
   OpeningCanceledEvent,
+  OpeningFilledEvent,
   OpeningStatusCancelled,
-  ApplicationStatusCancelled,
-  ApplicationWithdrawnEvent,
-  ApplicationStatusWithdrawn,
-  UpcomingWorkingGroupOpening,
-  StatusTextChangedEvent,
-  WorkingGroupMetadata,
-  WorkingGroupMetadataSet,
-  UpcomingOpeningRemoved,
-  InvalidActionMetadata,
-  WorkingGroupMetadataActionResult,
-  UpcomingOpeningAdded,
-  WorkerRoleAccountUpdatedEvent,
-  WorkerRewardAccountUpdatedEvent,
-  StakeIncreasedEvent,
+  OpeningStatusFilled,
+  OpeningStatusOpen,
   RewardPaidEvent,
   RewardPaymentType,
-  NewMissedRewardLevelReachedEvent,
-  WorkerExitedEvent,
-  WorkerStatusLeft,
-  WorkerStatusTerminated,
-  TerminatedWorkerEvent,
-  LeaderUnsetEvent,
+  StakeDecreasedEvent,
+  StakeIncreasedEvent,
+  StakeSlashedEvent,
+  StatusTextChangedEvent,
   TerminatedLeaderEvent,
+  TerminatedWorkerEvent,
+  UpcomingOpeningAdded,
+  UpcomingOpeningRemoved,
+  UpcomingWorkingGroupOpening,
+  Worker,
+  WorkerExitedEvent,
+  WorkerRewardAccountUpdatedEvent,
   WorkerRewardAmountUpdatedEvent,
-  StakeSlashedEvent,
-  StakeDecreasedEvent,
+  WorkerRoleAccountUpdatedEvent,
   WorkerStartedLeavingEvent,
-  BudgetSetEvent,
-  BudgetSpendingEvent,
-  LeaderSetEvent,
+  WorkerStatusActive,
   WorkerStatusLeaving,
-  BudgetFundedEvent,
+  WorkerStatusLeft,
+  WorkerStatusTerminated,
+  WorkingGroup,
+  WorkingGroupApplication,
+  WorkingGroupMetadata,
+  WorkingGroupMetadataActionResult,
+  WorkingGroupMetadataSet,
+  WorkingGroupOpening,
+  WorkingGroupOpeningMetadata,
+  WorkingGroupOpeningType,
 } from 'query-node/dist/model'
-import { createType } from '@joystream/types'
-import { DecodedMetadataObject } from '@joystream/metadata-protobuf/types'
-import { isSet } from '@joystream/metadata-protobuf/utils'
+import {
+  StorageWorkingGroup_BudgetSetEvent_V1001,
+  StorageWorkingGroup_ApplicationWithdrawnEvent_V1001 as WorkingGroup_ApplicationWithdrawnEvent_V1001,
+  StorageWorkingGroup_AppliedOnOpeningEvent_V1001 as WorkingGroup_AppliedOnOpeningEvent_V1001,
+  StorageWorkingGroup_BudgetSpendingEvent_V1001 as WorkingGroup_BudgetSpendingEvent_V1001,
+  StorageWorkingGroup_LeadRemarkedEvent_V1001 as WorkingGroup_LeadRemarkedEvent_V1001,
+  StorageWorkingGroup_NewMissedRewardLevelReachedEvent_V1001 as WorkingGroup_NewMissedRewardLevelReachedEvent_V1001,
+  StorageWorkingGroup_OpeningAddedEvent_V1001 as WorkingGroup_OpeningAddedEvent_V1001,
+  StorageWorkingGroup_OpeningCanceledEvent_V1001 as WorkingGroup_OpeningCanceledEvent_V1001,
+  StorageWorkingGroup_OpeningFilledEvent_V1001 as WorkingGroup_OpeningFilledEvent_V1001,
+  StorageWorkingGroup_RewardPaidEvent_V1001 as WorkingGroup_RewardPaidEvent_V1001,
+  StorageWorkingGroup_StakeDecreasedEvent_V1001 as WorkingGroup_StakeDecreasedEvent_V1001,
+  StorageWorkingGroup_StakeIncreasedEvent_V1001 as WorkingGroup_StakeIncreasedEvent_V1001,
+  StorageWorkingGroup_StakeSlashedEvent_V1001 as WorkingGroup_StakeSlashedEvent_V1001,
+  StorageWorkingGroup_StatusTextChangedEvent_V1001 as WorkingGroup_StatusTextChangedEvent_V1001,
+  StorageWorkingGroup_TerminatedWorkerEvent_V1001 as WorkingGroup_TerminatedWorkerEvent_V1001,
+  StorageWorkingGroup_WorkerExitedEvent_V1001 as WorkingGroup_WorkerExitedEvent_V1001,
+  StorageWorkingGroup_WorkerRemarkedEvent_V1001 as WorkingGroup_WorkerRemarkedEvent_V1001,
+  StorageWorkingGroup_WorkerRewardAccountUpdatedEvent_V1001 as WorkingGroup_WorkerRewardAccountUpdatedEvent_V1001,
+  StorageWorkingGroup_WorkerRewardAmountUpdatedEvent_V1001 as WorkingGroup_WorkerRewardAmountUpdatedEvent_V1001,
+  StorageWorkingGroup_WorkerRoleAccountUpdatedEvent_V1001 as WorkingGroup_WorkerRoleAccountUpdatedEvent_V1001,
+  StorageWorkingGroup_WorkerStartedLeavingEvent_V1001 as WorkingGroup_WorkerStartedLeavingEvent_V1001,
+  StorageWorkingGroup_WorkingGroupBudgetFundedEvent_V1001 as WorkingGroup_WorkingGroupBudgetFundedEvent_V1001,
+} from '../generated/types'
+import {
+  INT32MAX,
+  RelationsArr,
+  WorkingGroupModuleName,
+  bytesToString,
+  deserializeMetadata,
+  genericEventFields,
+  getById,
+  getByIdOrFail,
+  getOneByOrFail,
+  getWorkerOrFail,
+  inconsistentState,
+  invalidMetadata,
+  toNumber,
+} from './common'
 import { moderatePost } from './forum'
 
 // Reusable functions
-async function getWorkingGroup(
+async function getWorkingGroupLeadOrFail(store: DatabaseManager, groupName: WorkingGroupModuleName): Promise<Worker> {
+  return getOneByOrFail(store, Worker, { groupId: groupName, isLead: true, isActive: true })
+}
+
+async function getWorkingGroupOrFail(
   store: DatabaseManager,
   event: SubstrateEvent,
-  relations: string[] = []
+  relations: RelationsArr<WorkingGroup> = []
 ): Promise<WorkingGroup> {
-  const [groupName] = event.name.split('.')
+  const [name] = event.name.split('.')
 
-  return getWorkingGroupByName(store, groupName as WorkingGroupModuleName, relations)
+  return getOneByOrFail(store, WorkingGroup, { name }, relations)
 }
 
-async function getOpening(
+async function getOpeningOrFail(
   store: DatabaseManager,
-  openingstoreId: string,
+  openingStoreId: string,
   relations: string[] = []
 ): Promise<WorkingGroupOpening> {
-  const opening = await store.get(WorkingGroupOpening, { where: { id: openingstoreId }, relations })
-  if (!opening) {
-    return inconsistentState(`Opening not found by id ${openingstoreId}`)
-  }
-
-  return opening
+  return getByIdOrFail(store, WorkingGroupOpening, openingStoreId, relations as RelationsArr<WorkingGroupOpening>)
 }
 
-async function getApplication(store: DatabaseManager, applicationstoreId: string): Promise<WorkingGroupApplication> {
-  const application = await store.get(WorkingGroupApplication, { where: { id: applicationstoreId } })
-  if (!application) {
-    return inconsistentState(`Application not found by id`, applicationstoreId)
-  }
-
-  return application
+async function getApplicationOrFail(
+  store: DatabaseManager,
+  applicationStoreId: string
+): Promise<WorkingGroupApplication> {
+  return getByIdOrFail(store, WorkingGroupApplication, applicationStoreId)
 }
 
 async function getApplicationFormQuestions(
   store: DatabaseManager,
   openingstoreId: string
 ): Promise<ApplicationFormQuestion[]> {
-  const openingWithQuestions = await getOpening(store, openingstoreId, [
+  const openingWithQuestions = await getOpeningOrFail(store, openingstoreId, [
     'metadata',
     'metadata.applicationFormQuestions',
   ])
 
-  if (!openingWithQuestions) {
-    return inconsistentState('Opening not found by id', openingstoreId)
-  }
-  if (!openingWithQuestions.metadata.applicationFormQuestions) {
-    return inconsistentState('Application form questions not found for opening', openingstoreId)
-  }
-  return openingWithQuestions.metadata.applicationFormQuestions
+  return openingWithQuestions.metadata.applicationFormQuestions || []
 }
 
 const InputTypeToApplicationFormQuestionType = {
@@ -265,7 +259,7 @@ async function handleAddUpcomingOpeningAction(
   action: DecodedMetadataObject<IAddUpcomingOpening>
 ): Promise<UpcomingOpeningAdded | InvalidActionMetadata> {
   const upcomingOpeningMeta = action.metadata || {}
-  const group = await getWorkingGroup(store, event)
+  const group = await getWorkingGroupOrFail(store, event)
   const eventTime = new Date(event.blockTimestamp)
   const openingMeta = await await createWorkingGroupOpeningMetadata(
     store,
@@ -318,7 +312,7 @@ async function handleSetWorkingGroupMetadataAction(
   action: ISetGroupMetadata
 ): Promise<WorkingGroupMetadataSet> {
   const { newMetadata } = action
-  const group = await getWorkingGroup(store, event, ['metadata'])
+  const group = await getWorkingGroupOrFail(store, event, ['metadata'])
   const oldMetadata = group.metadata
   const setNewOptionalString = (field: keyof IWorkingGroupMetadata) =>
     typeof newMetadata?.[field] === 'string' ? newMetadata[field] || undefined : oldMetadata?.[field]
@@ -363,8 +357,8 @@ async function handleWorkingGroupMetadataAction(
 
 async function handleTerminatedWorker({ store, event }: EventContext & StoreContext): Promise<void> {
   const [workerId, optPenalty, optRationale] = new WorkingGroup_TerminatedWorkerEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event, ['leader'])
-  const worker = await getWorker(store, group.name as WorkingGroupModuleName, workerId, [
+  const group = await getWorkingGroupOrFail(store, event, ['leader'])
+  const worker = await getWorkerOrFail(store, group.name as WorkingGroupModuleName, workerId, [
     'application',
     'workinggroupleader',
   ])
@@ -402,13 +396,14 @@ async function handleTerminatedWorker({ store, event }: EventContext & StoreCont
 }
 
 export async function findLeaderSetEventByTxHash(store: DatabaseManager, txHash?: string): Promise<LeaderSetEvent> {
-  const leaderSetEvent = await store.get(LeaderSetEvent, { where: { inExtrinsic: txHash } })
-
-  if (!leaderSetEvent) {
-    return inconsistentState(`LeaderSet event not found by tx hash`, txHash)
-  }
-
-  return leaderSetEvent
+  return getOneByOrFail(
+    store,
+    LeaderSetEvent,
+    { inExtrinsic: txHash },
+    undefined,
+    undefined,
+    `LeaderSet event not found by tx hash: ${txHash}`
+  )
 }
 
 // expects `worker.application` to be available
@@ -423,7 +418,7 @@ function isWorkerActive(worker: Worker): boolean {
 export async function workingGroups_OpeningAdded({ store, event }: EventContext & StoreContext): Promise<void> {
   const [openingRuntimeId, metadataBytes, openingType, stakePolicy, optRewardPerBlock] =
     new WorkingGroup_OpeningAddedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
+  const group = await getWorkingGroupOrFail(store, event)
   const eventTime = new Date(event.blockTimestamp)
 
   const opening = new WorkingGroupOpening({
@@ -465,7 +460,7 @@ export async function workingGroups_AppliedOnOpening({ store, event }: EventCont
     applicationRuntimeId,
   ] = new WorkingGroup_AppliedOnOpeningEvent_V1001(event).params
 
-  const group = await getWorkingGroup(store, event)
+  const group = await getWorkingGroupOrFail(store, event)
   const openingstoreId = `${group.name}-${openingId.toString()}`
 
   const application = new WorkingGroupApplication({
@@ -495,7 +490,7 @@ export async function workingGroups_AppliedOnOpening({ store, event }: EventCont
 }
 
 export async function workingGroups_LeaderSet({ store, event }: EventContext & StoreContext): Promise<void> {
-  const group = await getWorkingGroup(store, event)
+  const group = await getWorkingGroupOrFail(store, event)
 
   const leaderSetEvent = new LeaderSetEvent({
     ...genericEventFields(event),
@@ -510,8 +505,8 @@ export async function workingGroups_OpeningFilled({ store, event }: EventContext
     event
   ).params
 
-  const group = await getWorkingGroup(store, event)
-  const opening = await getOpening(store, `${group.name}-${openingRuntimeId.toString()}`, [
+  const group = await getWorkingGroupOrFail(store, event)
+  const opening = await getOpeningOrFail(store, `${group.name}-${openingRuntimeId.toString()}`, [
     'applications',
     'applications.applicant',
   ])
@@ -618,8 +613,8 @@ async function removeIsLeadFromGroup(store: DatabaseManager, groupId: string) {
 export async function workingGroups_OpeningCanceled({ store, event }: EventContext & StoreContext): Promise<void> {
   const [openingRuntimeId] = new WorkingGroup_OpeningCanceledEvent_V1001(event).params
 
-  const group = await getWorkingGroup(store, event)
-  const opening = await getOpening(store, `${group.name}-${openingRuntimeId.toString()}`, ['applications'])
+  const group = await getWorkingGroupOrFail(store, event)
+  const opening = await getOpeningOrFail(store, `${group.name}-${openingRuntimeId.toString()}`, ['applications'])
 
   // Create and save event
   const openingCanceledEvent = new OpeningCanceledEvent({
@@ -654,8 +649,8 @@ export async function workingGroups_OpeningCanceled({ store, event }: EventConte
 export async function workingGroups_ApplicationWithdrawn({ store, event }: EventContext & StoreContext): Promise<void> {
   const [applicationRuntimeId] = new WorkingGroup_ApplicationWithdrawnEvent_V1001(event).params
 
-  const group = await getWorkingGroup(store, event)
-  const application = await getApplication(store, `${group.name}-${applicationRuntimeId.toString()}`)
+  const group = await getWorkingGroupOrFail(store, event)
+  const application = await getApplicationOrFail(store, `${group.name}-${applicationRuntimeId.toString()}`)
 
   // Create and save event
   const applicationWithdrawnEvent = new ApplicationWithdrawnEvent({
@@ -676,7 +671,7 @@ export async function workingGroups_ApplicationWithdrawn({ store, event }: Event
 
 export async function workingGroups_StatusTextChanged({ store, event }: EventContext & StoreContext): Promise<void> {
   const [, optBytes] = new WorkingGroup_StatusTextChangedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
+  const group = await getWorkingGroupOrFail(store, event)
 
   // Since result cannot be empty at this point, but we already need to have an existing StatusTextChangedEvent
   // in order to be able to create UpcomingOpening.createdInEvent relation, we use a temporary "mock" result
@@ -715,7 +710,7 @@ export async function workingGroups_StatusTextChanged({ store, event }: EventCon
 
 export async function workingGroups_LeadRemarked({ store, event }: EventContext & StoreContext): Promise<void> {
   const [metadataByte] = new WorkingGroup_LeadRemarkedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
+  const group = await getWorkingGroupOrFail(store, event)
 
   const metadata = deserializeMetadata(RemarkMetadataAction, metadataByte)
   if (metadata?.moderatePost) {
@@ -723,9 +718,13 @@ export async function workingGroups_LeadRemarked({ store, event }: EventContext
       return invalidMetadata(`The ${group.name} is incompatible with the remarked moderatePost`)
     }
     const { postId, rationale } = metadata.moderatePost
-    const actor = await getWorkingGroupLead(store, group.name)
+    const actor = await getWorkingGroupLeadOrFail(store, group.name)
 
-    await moderatePost(store, event, 'leadRemark', postId, actor, rationale)
+    const post = await getById(store, ForumPost, postId)
+    if (!post) {
+      return invalidMetadata(`Forum post not found by id: ${postId}`)
+    }
+    await moderatePost(store, event, 'leadRemark', post, actor, rationale)
   } else {
     return invalidMetadata('Unrecognized remarked action')
   }
@@ -733,7 +732,7 @@ export async function workingGroups_LeadRemarked({ store, event }: EventContext
 
 export async function workingGroups_WorkerRemarked({ store, event }: EventContext & StoreContext): Promise<void> {
   const [workerId, metadataByte] = new WorkingGroup_WorkerRemarkedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
+  const group = await getWorkingGroupOrFail(store, event)
 
   const metadata = deserializeMetadata(RemarkMetadataAction, metadataByte)
   if (metadata?.moderatePost) {
@@ -741,9 +740,13 @@ export async function workingGroups_WorkerRemarked({ store, event }: EventContex
       return invalidMetadata(`The ${group.name} is incompatible with the remarked moderatePost`)
     }
     const { postId, rationale } = metadata.moderatePost
-    const actor = await getWorker(store, group.name, workerId)
+    const actor = await getWorkerOrFail(store, group.name, workerId)
 
-    await moderatePost(store, event, 'workerRemark', postId, actor, rationale)
+    const post = await getById(store, ForumPost, postId)
+    if (!post) {
+      return invalidMetadata(`Forum post not found by id: ${postId}`)
+    }
+    await moderatePost(store, event, 'workerRemark', post, actor, rationale)
   } else {
     return invalidMetadata('Unrecognized remarked action')
   }
@@ -754,8 +757,8 @@ export async function workingGroups_WorkerRoleAccountUpdated({
   event,
 }: EventContext & StoreContext): Promise<void> {
   const [workerId, accountId] = new WorkingGroup_WorkerRoleAccountUpdatedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
-  const worker = await getWorker(store, group.name as WorkingGroupModuleName, workerId)
+  const group = await getWorkingGroupOrFail(store, event)
+  const worker = await getWorkerOrFail(store, group.name as WorkingGroupModuleName, workerId)
 
   const workerRoleAccountUpdatedEvent = new WorkerRoleAccountUpdatedEvent({
     ...genericEventFields(event),
@@ -776,8 +779,8 @@ export async function workingGroups_WorkerRewardAccountUpdated({
   event,
 }: EventContext & StoreContext): Promise<void> {
   const [workerId, accountId] = new WorkingGroup_WorkerRewardAccountUpdatedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
-  const worker = await getWorker(store, group.name as WorkingGroupModuleName, workerId)
+  const group = await getWorkingGroupOrFail(store, event)
+  const worker = await getWorkerOrFail(store, group.name as WorkingGroupModuleName, workerId)
 
   const workerRewardAccountUpdatedEvent = new WorkerRewardAccountUpdatedEvent({
     ...genericEventFields(event),
@@ -795,8 +798,8 @@ export async function workingGroups_WorkerRewardAccountUpdated({
 
 export async function workingGroups_StakeIncreased({ store, event }: EventContext & StoreContext): Promise<void> {
   const [workerId, increaseAmount] = new WorkingGroup_StakeIncreasedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
-  const worker = await getWorker(store, group.name as WorkingGroupModuleName, workerId)
+  const group = await getWorkingGroupOrFail(store, event)
+  const worker = await getWorkerOrFail(store, group.name as WorkingGroupModuleName, workerId)
 
   const stakeIncreasedEvent = new StakeIncreasedEvent({
     ...genericEventFields(event),
@@ -814,8 +817,8 @@ export async function workingGroups_StakeIncreased({ store, event }: EventContex
 
 export async function workingGroups_RewardPaid({ store, event }: EventContext & StoreContext): Promise<void> {
   const [workerId, rewardAccountId, amount, rewardPaymentType] = new WorkingGroup_RewardPaidEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
-  const worker = await getWorker(store, group.name as WorkingGroupModuleName, workerId)
+  const group = await getWorkingGroupOrFail(store, event)
+  const worker = await getWorkerOrFail(store, group.name as WorkingGroupModuleName, workerId)
 
   const rewardPaidEvent = new RewardPaidEvent({
     ...genericEventFields(event),
@@ -839,8 +842,8 @@ export async function workingGroups_NewMissedRewardLevelReached({
   event,
 }: EventContext & StoreContext): Promise<void> {
   const [workerId, newMissedRewardAmountOpt] = new WorkingGroup_NewMissedRewardLevelReachedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
-  const worker = await getWorker(store, group.name as WorkingGroupModuleName, workerId)
+  const group = await getWorkingGroupOrFail(store, event)
+  const worker = await getWorkerOrFail(store, group.name as WorkingGroupModuleName, workerId)
 
   const newMissedRewardLevelReachedEvent = new NewMissedRewardLevelReachedEvent({
     ...genericEventFields(event),
@@ -859,8 +862,8 @@ export async function workingGroups_NewMissedRewardLevelReached({
 
 export async function workingGroups_WorkerExited({ store, event }: EventContext & StoreContext): Promise<void> {
   const [workerId] = new WorkingGroup_WorkerExitedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
-  const worker = await getWorker(store, group.name as WorkingGroupModuleName, workerId, ['application'])
+  const group = await getWorkingGroupOrFail(store, event)
+  const worker = await getWorkerOrFail(store, group.name as WorkingGroupModuleName, workerId, ['application'])
 
   const workerExitedEvent = new WorkerExitedEvent({
     ...genericEventFields(event),
@@ -884,7 +887,7 @@ export async function workingGroups_WorkerExited({ store, event }: EventContext
 }
 
 export async function workingGroups_LeaderUnset({ store, event }: EventContext & StoreContext): Promise<void> {
-  const group = await getWorkingGroup(store, event, ['leader'])
+  const group = await getWorkingGroupOrFail(store, event, ['leader'])
 
   const leaderUnsetEvent = new LeaderUnsetEvent({
     ...genericEventFields(event),
@@ -911,8 +914,8 @@ export async function workingGroups_WorkerRewardAmountUpdated({
   event,
 }: EventContext & StoreContext): Promise<void> {
   const [workerId, newRewardPerBlockOpt] = new WorkingGroup_WorkerRewardAmountUpdatedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
-  const worker = await getWorker(store, group.name as WorkingGroupModuleName, workerId)
+  const group = await getWorkingGroupOrFail(store, event)
+  const worker = await getWorkerOrFail(store, group.name as WorkingGroupModuleName, workerId)
 
   const workerRewardAmountUpdatedEvent = new WorkerRewardAmountUpdatedEvent({
     ...genericEventFields(event),
@@ -931,8 +934,8 @@ export async function workingGroups_WorkerRewardAmountUpdated({
 export async function workingGroups_StakeSlashed({ store, event }: EventContext & StoreContext): Promise<void> {
   const [workerId, slashedAmount, requestedAmount, optRationale] = new WorkingGroup_StakeSlashedEvent_V1001(event)
     .params
-  const group = await getWorkingGroup(store, event)
-  const worker = await getWorker(store, group.name as WorkingGroupModuleName, workerId)
+  const group = await getWorkingGroupOrFail(store, event)
+  const worker = await getWorkerOrFail(store, group.name as WorkingGroupModuleName, workerId)
 
   const workerStakeSlashedEvent = new StakeSlashedEvent({
     ...genericEventFields(event),
@@ -952,8 +955,8 @@ export async function workingGroups_StakeSlashed({ store, event }: EventContext
 
 export async function workingGroups_StakeDecreased({ store, event }: EventContext & StoreContext): Promise<void> {
   const [workerId, amount] = new WorkingGroup_StakeDecreasedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
-  const worker = await getWorker(store, group.name as WorkingGroupModuleName, workerId)
+  const group = await getWorkingGroupOrFail(store, event)
+  const worker = await getWorkerOrFail(store, group.name as WorkingGroupModuleName, workerId)
 
   const workerStakeDecreasedEvent = new StakeDecreasedEvent({
     ...genericEventFields(event),
@@ -971,8 +974,8 @@ export async function workingGroups_StakeDecreased({ store, event }: EventContex
 
 export async function workingGroups_WorkerStartedLeaving({ store, event }: EventContext & StoreContext): Promise<void> {
   const [workerId, optRationale] = new WorkingGroup_WorkerStartedLeavingEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
-  const worker = await getWorker(store, group.name as WorkingGroupModuleName, workerId, ['application'])
+  const group = await getWorkingGroupOrFail(store, event)
+  const worker = await getWorkerOrFail(store, group.name as WorkingGroupModuleName, workerId, ['application'])
 
   const workerStartedLeavingEvent = new WorkerStartedLeavingEvent({
     ...genericEventFields(event),
@@ -993,7 +996,7 @@ export async function workingGroups_WorkerStartedLeaving({ store, event }: Event
 
 export async function workingGroups_BudgetSet({ store, event }: EventContext & StoreContext): Promise<void> {
   const [newBudget] = new StorageWorkingGroup_BudgetSetEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
+  const group = await getWorkingGroupOrFail(store, event)
 
   const budgetSetEvent = new BudgetSetEvent({
     ...genericEventFields(event),
@@ -1010,7 +1013,7 @@ export async function workingGroups_BudgetSet({ store, event }: EventContext & S
 
 export async function workingGroups_BudgetSpending({ store, event }: EventContext & StoreContext): Promise<void> {
   const [reciever, amount, optRationale] = new WorkingGroup_BudgetSpendingEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
+  const group = await getWorkingGroupOrFail(store, event)
 
   const budgetSpendingEvent = new BudgetSpendingEvent({
     ...genericEventFields(event),
@@ -1032,7 +1035,7 @@ export async function workingGroups_WorkingGroupBudgetFunded({
   event,
 }: EventContext & StoreContext): Promise<void> {
   const [memberId, amount, rationale] = new WorkingGroup_WorkingGroupBudgetFundedEvent_V1001(event).params
-  const group = await getWorkingGroup(store, event)
+  const group = await getWorkingGroupOrFail(store, event)
 
   const budgetFundedEvent = new BudgetFundedEvent({
     ...genericEventFields(event),
diff --git a/query-node/package.json b/query-node/package.json
index 89e233f97d..9f4fd3446f 100644
--- a/query-node/package.json
+++ b/query-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "query-node-root",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "GraphQL server and mappings. Generated with ♥ by Hydra-CLI",
   "scripts": {
     "build": "./build.sh",
@@ -47,5 +47,8 @@
   },
   "volta": {
     "extends": "../package.json"
+  },
+  "devDependencies": {
+    "node-gyp": "^9.4.0"
   }
 }
diff --git a/query-node/schemas/proposals.graphql b/query-node/schemas/proposals.graphql
index 2a3b280216..7bb4725562 100644
--- a/query-node/schemas/proposals.graphql
+++ b/query-node/schemas/proposals.graphql
@@ -332,6 +332,14 @@ type UpdateChannelPayoutsProposalDetails @variant {
   payloadHash: String
 }
 
+type UpdateGlobalNftLimitProposalDetails @variant {
+  "New daily NFT limit set in the proposal (if any)"
+  newDailyNftLimit: Int
+
+  "New weekly NFT limit set in the proposal (if any)"
+  newWeeklyNftLimit: Int
+}
+
 union ProposalDetails =
     SignalProposalDetails
   | RuntimeUpgradeProposalDetails
@@ -355,3 +363,4 @@ union ProposalDetails =
   | SetReferralCutProposalDetails
   | VetoProposalDetails
   | UpdateChannelPayoutsProposalDetails
+  | UpdateGlobalNftLimitProposalDetails
diff --git a/storage-node/src/services/queryNode/schema.graphql b/storage-node/src/services/queryNode/schema.graphql
index 59bf0630c5..d311147aa7 100644
--- a/storage-node/src/services/queryNode/schema.graphql
+++ b/storage-node/src/services/queryNode/schema.graphql
@@ -2108,7 +2108,7 @@ type Proposal implements BaseGraphQLObject {
   proposalexecutedeventproposal: [ProposalExecutedEvent!]
 }
 
-union ProposalDetails = SignalProposalDetails | RuntimeUpgradeProposalDetails | FundingRequestProposalDetails | SetMaxValidatorCountProposalDetails | CreateWorkingGroupLeadOpeningProposalDetails | FillWorkingGroupLeadOpeningProposalDetails | UpdateWorkingGroupBudgetProposalDetails | DecreaseWorkingGroupLeadStakeProposalDetails | SlashWorkingGroupLeadProposalDetails | SetWorkingGroupLeadRewardProposalDetails | TerminateWorkingGroupLeadProposalDetails | AmendConstitutionProposalDetails | CancelWorkingGroupLeadOpeningProposalDetails | SetMembershipPriceProposalDetails | SetCouncilBudgetIncrementProposalDetails | SetCouncilorRewardProposalDetails | SetInitialInvitationBalanceProposalDetails | SetInitialInvitationCountProposalDetails | SetMembershipLeadInvitationQuotaProposalDetails | SetReferralCutProposalDetails | VetoProposalDetails | UpdateChannelPayoutsProposalDetails
+union ProposalDetails = SignalProposalDetails | RuntimeUpgradeProposalDetails | FundingRequestProposalDetails | SetMaxValidatorCountProposalDetails | CreateWorkingGroupLeadOpeningProposalDetails | FillWorkingGroupLeadOpeningProposalDetails | UpdateWorkingGroupBudgetProposalDetails | DecreaseWorkingGroupLeadStakeProposalDetails | SlashWorkingGroupLeadProposalDetails | SetWorkingGroupLeadRewardProposalDetails | TerminateWorkingGroupLeadProposalDetails | AmendConstitutionProposalDetails | CancelWorkingGroupLeadOpeningProposalDetails | SetMembershipPriceProposalDetails | SetCouncilBudgetIncrementProposalDetails | SetCouncilorRewardProposalDetails | SetInitialInvitationBalanceProposalDetails | SetInitialInvitationCountProposalDetails | SetMembershipLeadInvitationQuotaProposalDetails | SetReferralCutProposalDetails | VetoProposalDetails | UpdateChannelPayoutsProposalDetails | UpdateGlobalNftLimitProposalDetails
 
 union ProposalStatus = ProposalStatusDeciding | ProposalStatusGracing | ProposalStatusDormant | ProposalStatusVetoed | ProposalStatusExecuted | ProposalStatusExecutionFailed | ProposalStatusSlashed | ProposalStatusRejected | ProposalStatusExpired | ProposalStatusCancelled | ProposalStatusCanceledByRuntime
 
@@ -2826,6 +2826,14 @@ type UpdateChannelPayoutsProposalDetails {
   payloadHash: String
 }
 
+type UpdateGlobalNftLimitProposalDetails {
+  """New daily NFT limit set in the proposal (if any)"""
+  newDailyNftLimit: Int
+
+  """New weekly NFT limit set in the proposal (if any)"""
+  newWeeklyNftLimit: Int
+}
+
 type UpdateWorkingGroupBudgetProposalDetails {
   """
   Amount to increase / decrease the working group budget by (will be decudted from / appended to council budget accordingly)
diff --git a/yarn.lock b/yarn.lock
index 150182e2fb..93b2699dad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2131,6 +2131,18 @@
   resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
   integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==
 
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
 "@istanbuljs/nyc-config-typescript@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@istanbuljs/nyc-config-typescript/-/nyc-config-typescript-1.0.1.tgz#55172f5663b3635586add21b14d42ca94a163d58"
@@ -2602,6 +2614,13 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@npmcli/fs@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e"
+  integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==
+  dependencies:
+    semver "^7.3.5"
+
 "@nuxtjs/opencollective@0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz#620ce1044f7ac77185e825e1936115bb38e2681c"
@@ -3532,6 +3551,11 @@
   resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.13.0.tgz#0290398b3eaebc6029c348988a78c3b688fe9219"
   integrity sha512-LMGqfSZkaMQXqewO0o1wvWr/2fQdCh4a3Sqlxka/UsJCe0cfLulh6x2aqnKLnsrSGiCq5rSCwvINd152i0nCqw==
 
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
 "@pm2/agent@~2.0.0":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@pm2/agent/-/agent-2.0.3.tgz#6b47fda837f185864767fe1e048f61d1de31fc45"
@@ -3552,9 +3576,9 @@
     ws "~7.4.0"
 
 "@pm2/io@~5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@pm2/io/-/io-5.0.0.tgz#623cbcaf6fe39375f20ac2e75497477a1b1ec5c5"
-  integrity sha512-3rToDVJaRoob5Lq8+7Q2TZFruoEkdORxwzFpZaqF4bmH6Bkd7kAbdPrI/z8X6k1Meq5rTtScM7MmDgppH6aLlw==
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@pm2/io/-/io-5.0.2.tgz#5e4177281280082d7c490bb776fad7f8448c6bca"
+  integrity sha512-XAvrNoQPKOyO/jJyCu8jPhLzlyp35MEf7w/carHXmWKddPzeNOFSEpSEqMzPDawsvpxbE+i918cNN+MwgVsStA==
   dependencies:
     "@opencensus/core" "0.0.9"
     "@opencensus/propagation-b3" "0.0.8"
@@ -3562,7 +3586,7 @@
     debug "~4.3.1"
     eventemitter2 "^6.3.1"
     require-in-the-middle "^5.0.0"
-    semver "6.3.0"
+    semver "~7.5.4"
     shimmer "^1.2.0"
     signal-exit "^3.0.3"
     tslib "1.9.3"
@@ -4220,6 +4244,11 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
 "@tootallnate/quickjs-emscripten@^0.23.0":
   version "0.23.0"
   resolved "https://registry.yarnpkg.com/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz#db4ecfd499a9765ab24002c3b696d02e6d32a12c"
@@ -5405,6 +5434,11 @@ abab@^2.0.0:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
+abbrev@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
 abort-controller@3.0.0, abort-controller@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -5507,7 +5541,7 @@ after-all-results@^2.0.0:
   resolved "https://registry.yarnpkg.com/after-all-results/-/after-all-results-2.0.0.tgz#6ac2fc202b500f88da8f4f5530cfa100f4c6a2d0"
   integrity sha512-2zHEyuhSJOuCrmas9YV0YL/MFCWLxe1dS6k/ENhgYrb/JqyMnadLN4iIAc9kkZrbElMDyyAGH/0J18OPErOWLg==
 
-agent-base@6:
+agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -5530,6 +5564,14 @@ agentkeepalive@^4.2.1:
     depd "^1.1.2"
     humanize-ms "^1.2.1"
 
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
 ajv-formats@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
@@ -5646,6 +5688,11 @@ ansi-regex@^5.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -5660,6 +5707,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0, ansi-styles@^4.2.0:
   dependencies:
     color-convert "^2.0.1"
 
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 ansicolors@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
@@ -5929,11 +5981,24 @@ aproba@^1.0.3:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
+"aproba@^1.0.3 || ^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+
 archy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
 
+are-we-there-yet@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
+  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^3.6.0"
+
 are-we-there-yet@~1.1.2:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
@@ -6942,6 +7007,24 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
+cacache@^17.0.0:
+  version "17.1.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.4.tgz#b3ff381580b47e85c6e64f801101508e26604b35"
+  integrity sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==
+  dependencies:
+    "@npmcli/fs" "^3.1.0"
+    fs-minipass "^3.0.0"
+    glob "^10.2.2"
+    lru-cache "^7.7.1"
+    minipass "^7.0.3"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    p-map "^4.0.0"
+    ssri "^10.0.0"
+    tar "^6.1.11"
+    unique-filename "^3.0.0"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -7258,6 +7341,11 @@ chownr@^1.0.1, chownr@^1.1.1:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -7359,6 +7447,11 @@ clean-regexp@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
 clean-stack@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-3.0.1.tgz#155bf0b2221bf5f4fba89528d24c5953f17fe3a8"
@@ -7680,6 +7773,11 @@ color-string@^1.6.0, color-string@^1.9.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 color@^3.1.3:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
@@ -7830,7 +7928,7 @@ consola@^2.15.0:
   resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
   integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
@@ -8211,10 +8309,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-uri-to-buffer@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz#db89a9e279c2ffe74f50637a59a32fb23b3e4d7c"
-  integrity sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==
+data-uri-to-buffer@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-6.0.1.tgz#540bd4c8753a25ee129035aebdedf63b078703c7"
+  integrity sha512-MZd3VlchQkp8rdend6vrx7MmVDJzSNTBvghvKjirLkD+WTChA3KUf0jkE68Q4UyctNqI11zZO9/x2Yx+ub5Cvg==
 
 data-urls@^1.0.0:
   version "1.1.0"
@@ -8303,9 +8401,9 @@ dayjs@^1.10.7:
   integrity sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw==
 
 dayjs@~1.11.5:
-  version "1.11.9"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.9.tgz#9ca491933fadd0a60a2c19f6c237c03517d71d1a"
-  integrity sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==
+  version "1.11.10"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
+  integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
 
 dayjs@~1.8.24:
   version "1.8.36"
@@ -8858,6 +8956,11 @@ dynamic-dedupe@^0.3.0:
   dependencies:
     xtend "^4.0.0"
 
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
 easy-table@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/easy-table/-/easy-table-1.1.0.tgz#86f9ab4c102f0371b7297b92a651d5824bc8cb73"
@@ -9006,6 +9109,11 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
 enabled@2.0.x:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
@@ -9026,7 +9134,7 @@ encoding-down@^6.0.2:
     level-codec "^9.0.0"
     level-errors "^2.0.0"
 
-encoding@^0.1.11:
+encoding@^0.1.11, encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -9083,6 +9191,11 @@ entities@~2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
   integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
 
+env-paths@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
+
 envalid@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/envalid/-/envalid-6.0.2.tgz#7139770e089acc945c0e47b5075d72915d8683e8"
@@ -9098,7 +9211,7 @@ err-code@^1.1.2:
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
   integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
 
-err-code@^2.0.0, err-code@^2.0.3:
+err-code@^2.0.0, err-code@^2.0.2, err-code@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
@@ -9485,6 +9598,11 @@ eslint-plugin-import@^2.22.0:
     resolve "^1.22.0"
     tsconfig-paths "^3.14.1"
 
+eslint-plugin-local-rules@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-local-rules/-/eslint-plugin-local-rules-2.0.0.tgz#cda95d7616cc0e2609d76c347c187ca2be1e252e"
+  integrity sha512-sWueme0kUcP0JC1+6OBDQ9edBDVFJR92WJHSRbhiRExlenMEuUisdaVBPR+ItFBFXo2Pdw6FD2UfGZWkz8e93g==
+
 eslint-plugin-mocha@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-5.3.0.tgz#cf3eb18ae0e44e433aef7159637095a7cb19b15b"
@@ -9965,6 +10083,11 @@ expect@^24.9.0:
     jest-message-util "^24.9.0"
     jest-regex-util "^24.9.0"
 
+exponential-backoff@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
+  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
+
 express-http-proxy@^1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/express-http-proxy/-/express-http-proxy-1.6.3.tgz#f3ef139ffd49a7962e7af0462bbcca557c913175"
@@ -10629,6 +10752,14 @@ foreground-child@^1.5.6:
     cross-spawn "^4"
     signal-exit "^3.0.0"
 
+foreground-child@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
+  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -10793,6 +10924,20 @@ fs-jetpack@^2.2.2:
     minimatch "^3.0.2"
     rimraf "^2.6.3"
 
+fs-minipass@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
+fs-minipass@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54"
+  integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==
+  dependencies:
+    minipass "^7.0.3"
+
 fs-readfile-promise@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fs-readfile-promise/-/fs-readfile-promise-2.0.1.tgz#80023823981f9ffffe01609e8be668f69ae49e70"
@@ -10866,6 +11011,20 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
+gauge@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
+    has-unicode "^2.0.1"
+    signal-exit "^3.0.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.5"
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -10993,12 +11152,12 @@ get-symbol-description@^1.0.0:
     get-intrinsic "^1.1.1"
 
 get-uri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-6.0.1.tgz#cff2ba8d456c3513a04b70c45de4dbcca5b1527c"
-  integrity sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-6.0.2.tgz#e019521646f4a8ff6d291fbaea2c46da204bb75b"
+  integrity sha512-5KLucCJobh8vBY1K07EFV4+cPZH3mrV9YeAruUseCQKHB58SGjjT2l9/eA9LD082IiuMjSlFJEcdJ27TXvbZNw==
   dependencies:
     basic-ftp "^5.0.2"
-    data-uri-to-buffer "^5.0.1"
+    data-uri-to-buffer "^6.0.0"
     debug "^4.3.4"
     fs-extra "^8.1.0"
 
@@ -11079,7 +11238,18 @@ glob@7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
+glob@^10.2.2:
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
+  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.3.5"
+    minimatch "^9.0.1"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+    path-scurry "^1.10.1"
+
+glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -11231,6 +11401,11 @@ graceful-fs@^4.2.2:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
   integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
 
+graceful-fs@^4.2.6:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 grapheme-splitter@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
@@ -11532,7 +11707,7 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.0:
+has-unicode@^2.0.0, has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
@@ -11746,6 +11921,11 @@ http-cache-semantics@^4.0.0:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
 
+http-cache-semantics@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
+
 http-call@^5.1.2, http-call@^5.2.2:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/http-call/-/http-call-5.3.0.tgz#4ded815b13f423de176eb0942d69c43b25b148db"
@@ -11827,6 +12007,15 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
 http-proxy-agent@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673"
@@ -12797,6 +12986,11 @@ is-ipfs@~0.6.0:
     multibase "~0.6.0"
     multihashes "~0.4.13"
 
+is-lambda@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
+
 is-local-path@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-local-path/-/is-local-path-0.1.6.tgz#815d144b14d569cecbead4d5693097f00a9bf6c5"
@@ -13271,6 +13465,15 @@ iterare@1.2.1:
   resolved "https://registry.yarnpkg.com/iterare/-/iterare-1.2.1.tgz#139c400ff7363690e33abffa33cbba8920f00042"
   integrity sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==
 
+jackspeak@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jaeger-client@^3.15.0:
   version "3.19.0"
   resolved "https://registry.yarnpkg.com/jaeger-client/-/jaeger-client-3.19.0.tgz#9b5bd818ebd24e818616ee0f5cffe1722a53ae6e"
@@ -14665,11 +14868,16 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.14.1:
+lru-cache@^7.14.1, lru-cache@^7.7.1:
   version "7.18.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
   integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
 
+"lru-cache@^9.1.1 || ^10.0.0":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
+  integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==
+
 lru-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
@@ -14737,6 +14945,27 @@ make-error@1.x, make-error@^1, make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
+make-fetch-happen@^11.0.3:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
+  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^17.0.0"
+    http-cache-semantics "^4.1.1"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^7.7.1"
+    minipass "^5.0.0"
+    minipass-fetch "^3.0.0"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^7.0.0"
+    ssri "^10.0.0"
+
 makeerror@1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
@@ -15319,6 +15548,13 @@ minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^9.0.1:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -15353,6 +15589,70 @@ minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-fetch@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.4.tgz#4d4d9b9f34053af6c6e597a64be8e66e42bf45b7"
+  integrity sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==
+  dependencies:
+    minipass "^7.0.3"
+    minipass-sized "^1.0.3"
+    minizlib "^2.1.2"
+  optionalDependencies:
+    encoding "^0.1.13"
+
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-sized@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass@^3.0.0:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
+  dependencies:
+    yallist "^4.0.0"
+
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.3:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+
+minizlib@^2.1.1, minizlib@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
 mixin-deep@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
@@ -15385,7 +15685,7 @@ mkdirp@0.x:
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@1.0.4, mkdirp@^1.0.4:
+mkdirp@1.0.4, mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -15818,7 +16118,7 @@ needle@2.4.0:
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-negotiator@0.6.3:
+negotiator@0.6.3, negotiator@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -15987,6 +16287,23 @@ node-gyp-build@~4.1.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb"
   integrity sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==
 
+node-gyp@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz#2a7a91c7cba4eccfd95e949369f27c9ba704f369"
+  integrity sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==
+  dependencies:
+    env-paths "^2.2.0"
+    exponential-backoff "^3.1.1"
+    glob "^7.1.4"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^11.0.3"
+    nopt "^6.0.0"
+    npmlog "^6.0.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^2.0.2"
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -16045,6 +16362,13 @@ noop-logger@^0.1.1:
   resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
   integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
 
+nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+  dependencies:
+    abbrev "^1.0.0"
+
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -16106,6 +16430,16 @@ npmlog@^4.0.1:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
+npmlog@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+  dependencies:
+    are-we-there-yet "^3.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.3"
+    set-blocking "^2.0.0"
+
 nssocket@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/nssocket/-/nssocket-0.6.0.tgz#59f96f6ff321566f33c70f7dbeeecdfdc07154fa"
@@ -16683,6 +17017,13 @@ p-map@^2.0.0, p-map@^2.1.0:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
 p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
@@ -16966,6 +17307,14 @@ path-root@^0.1.1:
   dependencies:
     path-root-regex "^0.1.0"
 
+path-scurry@^1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
+  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
+  dependencies:
+    lru-cache "^9.1.1 || ^10.0.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -17581,6 +17930,14 @@ prom-client@^12.0.0:
   dependencies:
     tdigest "^0.1.1"
 
+promise-retry@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
+  dependencies:
+    err-code "^2.0.2"
+    retry "^0.12.0"
+
 promise-timeout@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/promise-timeout/-/promise-timeout-1.3.0.tgz#d1c78dd50a607d5f0a5207410252a3a0914e1014"
@@ -19088,16 +19445,16 @@ semver-regex@^3.1.2:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@6.3.0, semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
 semver@^5.3.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
+semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
 semver@^7.0.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
@@ -19105,7 +19462,7 @@ semver@^7.0.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.2, semver@~7.5.0:
+semver@^7.2, semver@~7.5.0, semver@~7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -19378,11 +19735,16 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
+signal-exit@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
 signed-varint@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/signed-varint/-/signed-varint-2.0.1.tgz#50a9989da7c98c2c61dad119bc97470ef8528129"
@@ -19521,6 +19883,15 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
+socks-proxy-agent@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
+  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "^4.3.3"
+    socks "^2.6.2"
+
 socks-proxy-agent@^8.0.2:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz#5acbd7be7baf18c46a3f293a840109a430a640ad"
@@ -19530,7 +19901,7 @@ socks-proxy-agent@^8.0.2:
     debug "^4.3.4"
     socks "^2.7.1"
 
-socks@^2.7.1:
+socks@^2.6.2, socks@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
   integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
@@ -19713,6 +20084,13 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
+ssri@^10.0.0:
+  version "10.0.5"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.5.tgz#e49efcd6e36385196cb515d3a2ad6c3f0265ef8c"
+  integrity sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==
+  dependencies:
+    minipass "^7.0.3"
+
 stable@^0.1.8, stable@~0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -19843,6 +20221,15 @@ string-template@~0.2.1:
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
   integrity sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==
 
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -19860,15 +20247,6 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -19878,6 +20256,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
 string.prototype.matchall@^4.0.6:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d"
@@ -19938,6 +20325,13 @@ stringify-object@^3.2.1, stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -19959,12 +20353,12 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
   dependencies:
-    ansi-regex "^5.0.1"
+    ansi-regex "^6.0.1"
 
 strip-bom@^2.0.0:
   version "2.0.0"
@@ -20246,9 +20640,9 @@ sync-rpc@^1.2.1:
     get-port "^3.1.0"
 
 systeminformation@^5.7:
-  version "5.21.4"
-  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.21.4.tgz#046cd9c7e8c365c742a4726abbbe93de267308c8"
-  integrity sha512-fLW6j47UoAJDlZPEqykkWTKxubxb8IFuow6pMQlqf4irZ2lBgCrCReavMkH2t8VxxjOcg6wBlZ2EPQcluAT6xg==
+  version "5.21.15"
+  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.21.15.tgz#d40fb97462580e99522efa585b1c643cf930e788"
+  integrity sha512-vMLwsGgJZW6GvoBXVWNZuRQG0MPxlfQnIIIY9ZxoogWftUpJ9C33qD+32e1meFlXuWpN0moNApPFLpbsSi4OaQ==
 
 table@^6.0.9:
   version "6.8.0"
@@ -20310,6 +20704,18 @@ tar-stream@^2.1.4:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
+tar@^6.1.11, tar@^6.1.2:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
+  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^5.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
 tdigest@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021"
@@ -21085,6 +21491,20 @@ uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
   integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
+unique-filename@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
+  integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
+  dependencies:
+    unique-slug "^4.0.0"
+
+unique-slug@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
+  integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
+  dependencies:
+    imurmurhash "^0.1.4"
+
 unist-util-inspect@6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-6.0.1.tgz#1b6b52bc9af8632eb968227dc8ddaccb349913ad"
@@ -21618,7 +22038,7 @@ which-typed-array@^1.1.2:
     has-tostringtag "^1.0.0"
     is-typed-array "^1.1.9"
 
-which@2.0.2, which@^2.0.0, which@^2.0.1:
+which@2.0.2, which@^2.0.0, which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
@@ -21661,7 +22081,7 @@ wide-align@1.1.3:
   dependencies:
     string-width "^1.0.2 || 2"
 
-wide-align@^1.1.0:
+wide-align@^1.1.0, wide-align@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -21756,6 +22176,15 @@ workerpool@6.1.0:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz#a8e038b4c94569596852de7a8ea4228eefdeb37b"
   integrity sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==
 
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -21790,14 +22219,14 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
   dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
 
 wrappy@1:
   version "1.0.2"