-import * as express from 'express'
-import { param } from 'express-validator/check'
-import { isValidJobState } from '../../helpers/custom-validators/jobs'
-import { logger } from '../../helpers/logger'
-import { areValidationErrors } from './utils'
+import express from 'express'
+import { param, query } from 'express-validator'
+import { isValidJobState, isValidJobType } from '../../helpers/custom-validators/jobs'
+import { logger, loggerTagsFactory } from '../../helpers/logger'
+import { areValidationErrors } from './shared'
+
+const lTags = loggerTagsFactory('validators', 'jobs')