diff --git a/app/Events/Jobs/NewJobSearched.php b/app/Events/Jobs/NewJobSearched.php
new file mode 100644
index 00000000..16bfdd68
--- /dev/null
+++ b/app/Events/Jobs/NewJobSearched.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Events\Jobs;
+
+use App\Models\Job;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class NewJobSearched
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * @var Job
+     */
+    public $mysgs_job;
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(Job $mysgs_job)
+    {
+        $this->mysgs_job = $mysgs_job;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return \Illuminate\Broadcasting\Channel|array
+     */
+    public function broadcastOn()
+    {
+        return new PrivateChannel('channel-name');
+    }
+}
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
new file mode 100644
index 00000000..1f4e6447
--- /dev/null
+++ b/app/Http/Controllers/HomeController.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Services\Job\JobApiHandler;
+use App\Services\Rule\RuleFilter;
+use Illuminate\Http\Request;
+use Laravel\Jetstream\Jetstream;
+
+class HomeController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Inertia\Response
+     */
+    public function index(Request $request)
+    {
+        return Jetstream::inertia()->render($request, 'Dashboard', [
+            'team' => $request->user()->currentTeam,
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/OPs/JobController.php b/app/Http/Controllers/OPs/JobController.php
index 79281bb8..4897a054 100644
--- a/app/Http/Controllers/OPs/JobController.php
+++ b/app/Http/Controllers/OPs/JobController.php
@@ -3,56 +3,60 @@
 namespace App\Http\Controllers\OPs;
 
 use App\Http\Controllers\Controller;
+use App\Repositories\JobRepository;
 use App\Services\Job\JobApiHandler;
 use App\Services\Rule\RuleFilter;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
 use Laravel\Jetstream\Jetstream;
 
 class JobController extends Controller
 {
 
     /**
-     * Display a listing of the resource.
+     * Display rules relevant for a job.
      *
-     * @param Request $request
-     * @param null $jobNumber
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Inertia\Response
+     * @param  Request  $request
+     * @param  null  $jobNumber
+     * @return JsonResponse|\Inertia\Response
      */
-    public function show(Request $request, $jobNumber = null)
+    public function show(Request $request, $jobNumber)
     {
         $rules = [];
-        $job = null;
 
-        if($jobNumber){
-            $job = JobApiHandler::handle($jobNumber, 'basicDetails');
-            if ($job) {
-                $rules = RuleFilter::handle($job);
-            }
+        //$job = JobApiHandler::handle($jobNumber, 'basicDetails');
+
+        $job = JobRepository::findByJobNumber($jobNumber);
+
+        if (!$job->metadata->processing_mysgs) {
+            logger('already loaded mysgs data');
+            $rules = RuleFilter::handle($job);
         }
-        return Jetstream::inertia()->render($request, ($job ? 'OP/JobRules' : 'Dashboard'), [
-            'team' => $request->user()->currentTeam,
-            'jobNumber' => $jobNumber,
-            'job' => $job,
-            'rules' => $rules
-        ]);
+
+
+
+        return $request->wantsJson() ?
+            new JsonResponse(['rules' => $rules, 'job' => $job], 200)
+            : Jetstream::inertia()->render($request, 'OP/JobRules', [
+                'team' => $request->user()->currentTeam,
+                'jobNumber' => $jobNumber,
+                'job' => $job,
+                'rules' => $rules
+            ]);
     }
 
     /**
-     * Display a listing of the resource.
+     * Helper to redirect to show.
      *
-     * @param Request $request
-     * @param null $jobNumber
-     * @return \Illuminate\Http\JsonResponse
+     * @param  Request  $request
+     * @param  null  $jobNumber
+     * @return RedirectResponse
      */
     public function search(Request $request, $jobNumber)
     {
-        $rules = [];
-        if($jobNumber) {
-            $job = JobApiHandler::handle($jobNumber, 'basicDetails');
-            if ($job) {
-                $rules = RuleFilter::handle($job);
-            }
-        }
-        return response()->json($rules);
+        return \Redirect::route('job.rules', [$jobNumber]);
     }
 }
diff --git a/app/Listeners/Jobs/LoadMySgsData.php b/app/Listeners/Jobs/LoadMySgsData.php
new file mode 100644
index 00000000..f7ccbacf
--- /dev/null
+++ b/app/Listeners/Jobs/LoadMySgsData.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Listeners\Jobs;
+
+use App\Events\Jobs\NewJobSearched;
+use App\Models\Job;
+use App\Services\MySgs\DataLoader;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class LoadMySgsData implements ShouldQueue, ShouldBeUnique
+{
+
+    use InteractsWithQueue, Queueable;
+
+    /**
+     * @var Job
+     */
+    public $mysgs_job;
+
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  NewJobSearched  $event
+     * @return void
+     */
+    public function handle($event)
+    {
+        $this->mysgs_job = $event->mysgs_job;
+
+        logger('handling job '.$this->mysgs_job->job_number);
+
+        DataLoader::handle($this->mysgs_job);
+    }
+
+    /**
+     * The unique ID of the job.
+     *
+     * @return string
+     */
+    public function uniqueId()
+    {
+        return $this->mysgs_job->id;
+    }
+
+    /**
+     * @param $event
+     * @param  \Exception|null  $exception
+     */
+    public function failed($event, $exception)
+    {
+        \Log::error('loading mysgs data failed');
+        \Log::error($exception->getMessage());
+        \Log::error($exception->getTraceAsString());
+        $job_metadata = $event->mysgs_job->metadata;
+        $job_metadata->error_mysgs = true;
+        $event->mysgs_job->metadata = $job_metadata;
+
+        $event->mysgs_job->save();
+    }
+}
diff --git a/app/Models/ClientAccount.php b/app/Models/ClientAccount.php
index 3484639b..38cc76de 100644
--- a/app/Models/ClientAccount.php
+++ b/app/Models/ClientAccount.php
@@ -31,6 +31,10 @@
  * @method static \Illuminate\Database\Eloquent\Builder|ClientAccount whereLegacyId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ClientAccount whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @property string|null $legacy_id
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Rule[] $rules
+ * @property-read int|null $rules_count
+ * @property-read \App\Models\Team|null $team
  */
 class ClientAccount extends Model
 {
diff --git a/app/Models/FieldMapping.php b/app/Models/FieldMapping.php
index 7b07fb51..cba209fb 100644
--- a/app/Models/FieldMapping.php
+++ b/app/Models/FieldMapping.php
@@ -7,8 +7,31 @@
 
 /**
  * Class FieldMapping
+ *
  * @package App\Models
  * @mixin \Eloquent
+ * @property int $id
+ * @property string $api_name
+ * @property string|null $api_version
+ * @property string $api_action
+ * @property string $field_path
+ * @property string|null $resolver_name
+ * @property int $taxonomy_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property-read \App\Models\Taxonomy $taxonomy
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping query()
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping whereApiAction($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping whereApiName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping whereApiVersion($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping whereFieldPath($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping whereResolverName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping whereTaxonomyId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|FieldMapping whereUpdatedAt($value)
  */
 class FieldMapping extends Model
 {
diff --git a/app/Models/Job.php b/app/Models/Job.php
index e6285d28..f9097db7 100644
--- a/app/Models/Job.php
+++ b/app/Models/Job.php
@@ -5,6 +5,28 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Models\Job
+ *
+ * @property int $id
+ * @property string $job_number
+ * @property string|null $designation
+ * @property object|null $metadata
+ * @property string|null $deleted_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|Job newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Job newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|Job query()
+ * @method static \Illuminate\Database\Eloquent\Builder|Job whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Job whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Job whereDesignation($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Job whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Job whereJobNumber($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Job whereMetadata($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|Job whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class Job extends Model
 {
     use HasFactory;
diff --git a/app/Models/MysgsClientAccount.php b/app/Models/MysgsClientAccount.php
index d6b9450a..291edd68 100644
--- a/app/Models/MysgsClientAccount.php
+++ b/app/Models/MysgsClientAccount.php
@@ -5,6 +5,24 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * App\Models\MysgsClientAccount
+ *
+ * @property int $id
+ * @property string $name
+ * @property string|null $alias
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|MysgsClientAccount newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MysgsClientAccount newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MysgsClientAccount query()
+ * @method static \Illuminate\Database\Eloquent\Builder|MysgsClientAccount whereAlias($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MysgsClientAccount whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MysgsClientAccount whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MysgsClientAccount whereName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MysgsClientAccount whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class MysgsClientAccount extends Model
 {
     use HasFactory;
diff --git a/app/Models/Rule.php b/app/Models/Rule.php
index 28706b87..842eae08 100644
--- a/app/Models/Rule.php
+++ b/app/Models/Rule.php
@@ -38,6 +38,8 @@
  * @method static \Illuminate\Database\Query\Builder|Rule withTrashed()
  * @method static \Illuminate\Database\Query\Builder|Rule withoutTrashed()
  * @mixin \Eloquent
+ * @property-read \Illuminate\Database\Eloquent\Collection|\OwenIt\Auditing\Models\Audit[] $audits
+ * @property-read int|null $audits_count
  */
 class Rule extends Model implements Auditable
 {
diff --git a/app/Models/Taxonomy.php b/app/Models/Taxonomy.php
index 0f2feb34..8f78e0a2 100644
--- a/app/Models/Taxonomy.php
+++ b/app/Models/Taxonomy.php
@@ -38,6 +38,8 @@
  * @method static \Illuminate\Database\Query\Builder|Taxonomy withTrashed()
  * @method static \Illuminate\Database\Query\Builder|Taxonomy withoutTrashed()
  * @mixin \Eloquent
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ClientAccount[] $client_accounts
+ * @property-read \App\Models\FieldMapping|null $mapping
  */
 class Taxonomy extends Model
 {
@@ -63,6 +65,8 @@ class Taxonomy extends Model
 
     protected $with = ['parent'];
 
+    protected $appends = ['requiresMapping'];
+
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
@@ -103,4 +107,9 @@ public function mapping()
     {
         return $this->hasOne(FieldMapping::class);
     }
+
+    public function getRequiresMappingAttribute()
+    {
+        return $this->parent && $this->parent->name == 'Account Structure';
+    }
 }
diff --git a/app/Models/Term.php b/app/Models/Term.php
index 320288ca..f6f3afe8 100644
--- a/app/Models/Term.php
+++ b/app/Models/Term.php
@@ -28,6 +28,10 @@
  * @method static \Illuminate\Database\Eloquent\Builder|Term whereTaxonomyId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Term whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Rule[] $rules
+ * @property-read int|null $rules_count
+ * @method static \Illuminate\Database\Eloquent\Builder|Term whereDeletedAt($value)
  */
 class Term extends Model
 {
diff --git a/app/Models/User.php b/app/Models/User.php
index 084ab542..f7bc2027 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -54,6 +54,13 @@
  * @method static \Illuminate\Database\Eloquent\Builder|User whereTwoFactorSecret($value)
  * @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value)
  * @mixin \Eloquent
+ * @property string|null $azure_id
+ * @property-read \Illuminate\Database\Eloquent\Collection|\OwenIt\Auditing\Models\Audit[] $audits
+ * @property-read int|null $audits_count
+ * @property-read \Illuminate\Database\Eloquent\Collection|\Silvanite\Brandenburg\Role[] $roles
+ * @property-read int|null $roles_count
+ * @method static \Illuminate\Database\Eloquent\Builder|User whereAzureId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|User withRoles()
  */
 class User extends Authenticatable implements Auditable
 {
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 78b6f953..47895ceb 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -31,6 +31,10 @@ class EventServiceProvider extends ServiceProvider
 
         'App\\Events\\Rules\\Unflagged' => [
             'App\\Listeners\\Rules\\RebuildRuleCache',
+        ],
+
+        'App\\Events\\Jobs\\NewJobSearched' => [
+            'App\\Listeners\\Jobs\\LoadMySgsData',
         ]
 //        Audited::class => [
 //            AuditedListener::class
diff --git a/app/Repositories/JobRepository.php b/app/Repositories/JobRepository.php
new file mode 100644
index 00000000..446826f2
--- /dev/null
+++ b/app/Repositories/JobRepository.php
@@ -0,0 +1,44 @@
+<?php
+
+
+namespace App\Repositories;
+
+
+use App\Events\Jobs\NewJobSearched;
+use App\Listeners\Jobs\LoadMySgsData;
+use App\Models\Job;
+
+class JobRepository
+{
+
+    public static function createFromJobNumber($job_number)
+    {
+        return Job::create([
+            'job_number' => $job_number,
+            'metadata' => [
+                'rules' => null,
+                'processing_mysgs' => true,
+                'error_mysgs' => false,
+                'client_found' => false,
+            ],
+        ]);
+    }
+
+    public static function findByJobNumber($job_number)
+    {
+        $job = Job::whereJobNumber($job_number)->first();
+
+        if (!$job) {
+            $job = static::createFromJobNumber($job_number);
+
+            event(new NewJobSearched($job));
+        } elseif ($job->metadata->processing_mysgs) {
+            logger($job_number . ' still processing, adding to queue, if running it will not re-trigger');
+            event(new NewJobSearched($job));
+        }
+
+        return $job;
+
+
+    }
+}
diff --git a/app/Services/ClientAccounts/BuildTaxonomyWithUsage.php b/app/Services/ClientAccounts/BuildTaxonomyWithUsage.php
index 93a2030e..62c3eec7 100644
--- a/app/Services/ClientAccounts/BuildTaxonomyWithUsage.php
+++ b/app/Services/ClientAccounts/BuildTaxonomyWithUsage.php
@@ -31,7 +31,8 @@ public function handle()
             foreach ($top_taxonomy->taxonomies()
                          ->whereHas('client_accounts', function ($query) use ($client_account) {
                              return $query->whereIn('id', [$client_account->id]);
-                         })->get() as $taxonomy) {
+                         })->with('mapping')
+                         ->get() as $taxonomy) {
 
                 $this->taxonomy_hierarchy[$top_taxonomy->name]['children'][] = static::processTaxonomy($taxonomy);
             }
diff --git a/app/Services/Job/JobApiHandler.php b/app/Services/Job/JobApiHandler.php
index cf31389d..8f8bc6fd 100644
--- a/app/Services/Job/JobApiHandler.php
+++ b/app/Services/Job/JobApiHandler.php
@@ -7,32 +7,74 @@
 use App\Broadcast\RulesFiltered;
 use App\Jobs\JobApiRequest;
 use App\Models\Job;
+use App\Repositories\JobRepository;
 use App\Services\MySgs\Api\JobApi;
 
 class JobApiHandler
 {
     /**
-     * @param $jobNumber
-     * @param $apiName
-     * @return Job
+     * @var Job
      */
-    public static function handle($jobNumber, $apiName){
+    public $job;
 
-        $job = Job::whereJobNumber($jobNumber)->first();
+    public $response;
 
-        if($job){
-            JobApiRequest::dispatch($jobNumber, $apiName);
-            return $job;
+    /**
+     * JobApiHandler constructor.
+     * @param  Job  $job
+     */
+    public function __construct($job)
+    {
+        if (is_string($job)) {
+            $job = JobRepository::createFromJobNumber($job);
         }
 
-        $jobDetails = JobApi::$apiName($jobNumber);
+        $this->job = $job;
+    }
+
+
+    /**
+     * @param $apiName
+     * @return JobApiHandler
+     */
+    public function handle($apiName)
+    {
+        logger('handling api call ' . $apiName . ' on job ' . $this->job->id);
+
 
-        $job = Job::create([
-            'job_number' => $jobNumber,
-            'metadata' => [ $apiName => $jobDetails ]
-        ]);
+        $this->response = JobApi::$apiName($this->getApiParam($apiName));
+
+        $job_metadata = $this->job->metadata;
+
+        $job_metadata->$apiName = $this->response;
+
+        $this->job->metadata = $job_metadata;
+        $this->job->save();
+
+        return $this;
+    }
+
+
+    protected function getApiParam($apiName) {
+        /*
+         * Build the appropriate Api object
+         */
+        $apiclass = 'App\Services\MySgs\Api\JobApi';
+        $api = new $apiclass;
+        $function = $apiName;
+
+        /*
+         * Check which parameter is expected from the api function
+         */
+        $signature = get_func_argNames($function, $api);
+
+        if (array_keys($signature)[0] == 'jobVersionId') {
+            $param = $this->job->metadata->basicInfo->jobVersionId;
+        } else {
+            $param = $this->job->job_number;
+        }
 
-        return $job;
+        return $param;
     }
 
 }
diff --git a/app/Services/MySgs/Api/JobApi.php b/app/Services/MySgs/Api/JobApi.php
index e99a13e1..01b191bf 100644
--- a/app/Services/MySgs/Api/JobApi.php
+++ b/app/Services/MySgs/Api/JobApi.php
@@ -13,16 +13,19 @@ public static function jobSearch($query, $params = [])
 
     public static function basicInfo($formattedJobNumber, $params = [], $array_mode = false)
     {
+        logger('basic info api');
         return static::get('Job/basicInfo/formattedJobNumber/', $formattedJobNumber, $params, $array_mode);
     }
 
     public static function basicDetails($jobVersionId, $params = [])
     {
+        logger('basic details api');
         return static::get('JobVersion/basicDetails/', $jobVersionId, $params);
     }
 
     public static function extraDetails($jobVersionId, $params = [])
     {
+        logger('extra details api');
         return static::get('JobVersion/extraDetails/', $jobVersionId, $params);
     }
 }
diff --git a/app/Services/MySgs/DataLoader.php b/app/Services/MySgs/DataLoader.php
new file mode 100644
index 00000000..bae1a747
--- /dev/null
+++ b/app/Services/MySgs/DataLoader.php
@@ -0,0 +1,50 @@
+<?php
+
+
+namespace App\Services\MySgs;
+
+use App\Models\ClientAccount;
+use App\Models\Job;
+use App\Services\Job\JobApiHandler;
+use Illuminate\Support\Str;
+
+class DataLoader
+{
+
+    /**
+     * @param Job $job
+     */
+    public static function handle($job) {
+        $basicInfo = (new JobApiHandler($job))->handle('basicInfo');
+        $basicDetails = (new JobApiHandler($job))->handle('basicDetails');
+        $extraDetails = (new JobApiHandler($job))->handle('extraDetails');
+
+        $job->designation = $basicInfo->response->jobDescription;
+        $job_metadata = $job->metadata;
+        $job_metadata->processing_mysgs = false;
+
+        try {
+            $customer_name = $job->metadata->basicDetails->retailer->customerName;
+
+            $client = ClientAccount::where('name', 'LIKE', '%'.$customer_name.'%')
+                ->orWhereRaw('LOWER(alias) LIKE "%'.Str::lower($job->metadata->basicDetails->retailer->customerName).'%"')
+                ->first();
+
+            if($client) {
+                $job_metadata->client = $client->only(['id', 'name', 'slug', 'image']);
+                $job_metadata->client_found = true;
+            } else {
+                $job_metadata->client_found = false;
+                $job_metadata->client = ['name' => $customer_name];
+            }
+
+        } catch (\Exception $e) {
+            \Log::error('could not deduce client');
+            $job_metadata->client = ['name' => $customer_name];
+            $job_metadata->client_found = false;
+        }
+
+        $job->metadata = $job_metadata;
+        $job->save();
+    }
+}
diff --git a/app/Services/MySgs/Mapping/Mapper.php b/app/Services/MySgs/Mapping/Mapper.php
index 0de1e1f2..41741e9d 100644
--- a/app/Services/MySgs/Mapping/Mapper.php
+++ b/app/Services/MySgs/Mapping/Mapper.php
@@ -12,8 +12,8 @@ class Mapper
 {
 
     /**
-     * @param Job $job
-     * @param FieldMapping $mapping
+     * @param  Job  $job
+     * @param  FieldMapping  $mapping
      * @return array|\ArrayAccess|mixed|void
      */
     public static function getMetaValue(Job $job, FieldMapping $mapping)
@@ -22,25 +22,29 @@ public static function getMetaValue(Job $job, FieldMapping $mapping)
         /*
          * Build the appropriate Api object
          */
-        $apiClass = 'App\Services\MySgs\Api\\' . $mapping->api_name;
+        $apiClass = 'App\Services\MySgs\Api\\'.$mapping->api_name;
         $api = new $apiClass;
         $function = $mapping->api_action;
 
         /*
          * Check which parameter is expected from the api function
          */
-        //        $signature = get_func_argNames($function, $api);
-        //
-        //        if (array_keys($signature)[0] == 'jobVersionId') {
-        //            if (!is_array($job)) {
-        //                $job = json_decode($job);
-        //            }
-        //            $param = $job['jobVersionId'];
-        //        } else {
-        //            $param = $job['job_number'];
-        //        }
-
-        $response = $api::$function($job->job_number);
+        $signature = get_func_argNames($function, $api);
+
+        if (array_keys($signature)[0] == 'jobVersionId') {
+            if (!is_array($job)) {
+                $job = json_decode($job);
+            }
+            $param = $job->metadata->basicInfo->jobVersionId;
+        } else {
+            $param = $job->job_number;
+        }
+
+        if (isset($job->metadata->{$mapping->api_action})) {
+            $response = $job->metadata->{$mapping->api_action};
+        } else {
+            $response = $api::$function($param);
+        }
 
         return static::parseMapping($mapping, $response);
     }
@@ -53,8 +57,8 @@ protected static function parseMapping($mapping, $data)
         $dataToResolve = static::parseFieldPathSection($field_path_sections, $data);
 
         // send the response to resolver to make some changes according to your need to tag
-        if($mapping->resolver_name !== null){
-            $resolverClass = 'App\Services\Resolvers\\' . $mapping->resolver_name;
+        if ($mapping->resolver_name !== null) {
+            $resolverClass = 'App\Services\Resolvers\\'.$mapping->resolver_name;
             $resolver = new $resolverClass;
             $dataToResolve = $resolver::handle($dataToResolve);
         }
@@ -72,7 +76,7 @@ protected static function parseFieldPathSection($field_path_sections, $data)
         }
 
         if (is_int($section) || $section === "0") {
-            if(!isset($data[$section])){
+            if (!isset($data[$section])) {
                 return null;
             }
             return static::parseFieldPathSection($field_path_sections, $data[$section]);
diff --git a/app/Services/Rule/RuleFilter.php b/app/Services/Rule/RuleFilter.php
index 15ad9fc5..603a0289 100644
--- a/app/Services/Rule/RuleFilter.php
+++ b/app/Services/Rule/RuleFilter.php
@@ -14,6 +14,28 @@
 class RuleFilter
 {
 
+    public static function findClient($job)
+    {
+        $customer_name = $job->metadata->basicDetails->retailer->customerName;
+
+        $client = ClientAccount::where('name', 'LIKE', '%'.$customer_name.'%')
+            ->orWhereRaw('LOWER(alias) LIKE "%'.Str::lower($job->metadata->basicDetails->retailer->customerName).'%"')
+            ->first();
+
+        $job_metadata = $job->metadata;
+
+        if($client) {
+            $job_metadata->client = $client->only(['id', 'name', 'slug', 'image']);
+            $job_metadata->client_found = true;
+        } else {
+            $job_metadata->client_found = false;
+            $job_metadata->client = ['name' => $customer_name];
+        }
+
+        $job->metadata = $job_metadata;
+        $job->save();
+    }
+
     /**
      * @param  Job  $job
      * @return array
@@ -23,11 +45,16 @@ public static function handle(Job $job): array
 
         $clientRules = [];
 
-        if ($job->metadata->basicDetails) {
-            $client = ClientAccount::with('rules.terms.taxonomy')->whereRaw('LOWER(alias) LIKE "%'.Str::lower($job->metadata->basicDetails->retailer->customerName).'%"')->first();
+        if (!$job->metadata->client_found) {
+            static::findClient($job);
+        }
+
+        if ($job->metadata->client_found) {
+
+            $client = ClientAccount::find($job->metadata->client->id);
+            logger('loaded client '.$client->name);
 
             $metadata = $job->metadata;
-            $metadata->client = $client->only(['id', 'name', 'slug']);
 
             $job_taxonomy_terms_matches = [];
             $job_taxonomy_terms = [];
diff --git a/resources/js/Components/Loader.vue b/resources/js/Components/Loader.vue
new file mode 100644
index 00000000..482e5f4a
--- /dev/null
+++ b/resources/js/Components/Loader.vue
@@ -0,0 +1,43 @@
+<template>
+    <div class="flex flex-col items-center justify-center">
+        <div class="mt-1/5 loader ease-linear rounded-full border-4 border-t-4 border-gray-200 h-12 w-12 mb-4"></div>
+        <h2 class="text-center text-gray-800 text-xl font-semibold">Loading...</h2>
+        <p class="w-1/3 text-center text-gray-800">
+            <slot>
+                Patience you must have.<br>Worth it will be.
+            </slot>
+        </p>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "Loader"
+}
+</script>
+
+<style scoped>
+.loader {
+    border-top-color: #3498db;
+    -webkit-animation: spinner 1.5s linear infinite;
+    animation: spinner 1.5s linear infinite;
+}
+
+@-webkit-keyframes spinner {
+    0% {
+        -webkit-transform: rotate(0deg);
+    }
+    100% {
+        -webkit-transform: rotate(360deg);
+    }
+}
+
+@keyframes spinner {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}
+</style>
diff --git a/resources/js/Components/OP/JobIdentification.vue b/resources/js/Components/OP/JobIdentification.vue
new file mode 100644
index 00000000..f345fe82
--- /dev/null
+++ b/resources/js/Components/OP/JobIdentification.vue
@@ -0,0 +1,53 @@
+<template>
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 bg-gray-50 shadow-inner border border-orange-200">
+        <div class="flex flex-col">
+
+            <div class="flex flex-row">
+                <img :src="'/'+job.metadata.client.image" style="max-width: 80px">
+                <h3 class="font-semibold text-lg leading-loose text-gray-800 ">
+                    {{ job.designation }}
+                </h3>
+            </div>
+
+            <div class="flex flex-row my-2 ">
+                <div v-for="(value, item) in job.metadata.job_taxonomy" class="flex flex-col">
+                    <div class="flex flex-wrap flex-shrink-0 text-xs items-center pr-3 text-xs mr-3">
+                        <div class="flex-grow h-full bg-gray-300 text-gray-600 px-2 rounded-l-lg">
+                            <div class="grid h-full">
+                                <div class="place-self-center">{{ item }}</div>
+                            </div>
+                        </div>
+                        <div class="">
+
+                            <div :class="job.metadata.matched_taxonomy[item].length ?
+                                                'bg-blue-200 text-green-800 px-2 rounded-tr-lg'
+                                                :'bg-blue-200 text-green-800 px-2 rounded-r-lg'"
+                                 title="MySGS value">{{ value }}
+                            </div>
+
+                            <div v-for="(terms, index) in job.metadata.matched_taxonomy[item]"
+                                 :class="(index === job.metadata.matched_taxonomy[item].length - 1) ?
+                                                    'bg-pink-200 text-green-800 px-2 rounded-br-lg'
+                                                    :'bg-pink-200 text-green-800 px-2'"
+                                 title="Matched Dagobah terms">
+                                {{ terms }}<br>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "JobIdentification",
+    props: ['job'],
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/resources/js/Components/OP/JobSearchForm.vue b/resources/js/Components/OP/JobSearchForm.vue
index 6f9353bd..f7d0d517 100644
--- a/resources/js/Components/OP/JobSearchForm.vue
+++ b/resources/js/Components/OP/JobSearchForm.vue
@@ -47,11 +47,8 @@ export default {
 
     methods: {
         findJob() {
-            this.form.post(route('home', this.jobNumber), {
-                preserveScroll: true
-            }).then(() => {
-                this.$emit('loaded')
-            });
+            this.$emit('searching')
+            this.form.post(route('job.rules', this.jobNumber));
         }
     },
 }
diff --git a/resources/js/Components/PM/ClientAccount/TaxonomyDefinition.vue b/resources/js/Components/PM/ClientAccount/TaxonomyDefinition.vue
index c1315fdc..e91cacbf 100644
--- a/resources/js/Components/PM/ClientAccount/TaxonomyDefinition.vue
+++ b/resources/js/Components/PM/ClientAccount/TaxonomyDefinition.vue
@@ -14,12 +14,20 @@
                 <jet-action-section>
                     <template #title>
 
-                        <span @click="editTaxonomy(taxonomyData.id, name)"
-                              class="mt-2 cursor-pointer
-                          border-b-2 border-dashed border-transparent hover:border-gray-300
-                          transition duration-150 ease-in-out">
-                        {{ name }}
-                        </span>
+                        <div :data-id="taxonomyData.id" @click="editTaxonomy(taxonomyData.id, name)"
+                             class="mt-2 cursor-pointer border-b-2 border-dashed border-transparent hover:border-gray-300
+                             transition duration-150 ease-in-out"
+                             :class="{'text-red-600': taxonomyData.taxonomy.requiresMapping && !(taxonomyData.taxonomy.mapping && taxonomyData.taxonomy.mapping.id)}"
+                             :title="(taxonomyData.taxonomy.mapping && taxonomyData.taxonomy.mapping.id) ?
+                        taxonomyData.taxonomy.mapping.api_name +'/'+ taxonomyData.taxonomy.mapping.api_action + '//' +taxonomyData.taxonomy.mapping.field_path: 'No mapping'">
+                            {{ name }}
+                        </div>
+<!--                        <div v-if="taxonomyData.taxonomy.mapping && taxonomyData.taxonomy.mapping.id">
+                            <span class="text-xs">
+                                {{ taxonomyData.taxonomy.mapping.api_name }}/{{taxonomyData.taxonomy.mapping.api_action }}//{{ taxonomyData.taxonomy.mapping.field_path }}
+                                </span>
+                        </div>-->
+
 
                     </template>
 
diff --git a/resources/js/Pages/OP/JobRules.vue b/resources/js/Pages/OP/JobRules.vue
index 4dc6c173..2cd0be2a 100644
--- a/resources/js/Pages/OP/JobRules.vue
+++ b/resources/js/Pages/OP/JobRules.vue
@@ -4,13 +4,13 @@
             <div class="flex justify-between align-middle">
 
                 <div class="flex-grow">
-                    <h2 v-if="job" class="pt-2 font-bold text-xl text-gray-800 leading-tight">
-                        Rules for job {{ job.job_number }}
+                    <h2 v-if="currentJob" class="pt-2 font-bold text-xl text-gray-800 leading-tight">
+                        Rules for job {{ currentJob.job_number }}
                     </h2>
                 </div>
 
                 <div class="flex-grow">
-                    <job-search @loaded="newJobLoaded"
+                    <job-search @searching="runningSearch"
                                 classes="bg-white flex"
                                 placeholder="Search another job">
                     </job-search>
@@ -18,97 +18,87 @@
             </div>
         </template>
 
-        <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 bg-gray-50 shadow-inner border border-orange-200">
-            <div class="flex justify-between">
-                <div class="p-2">
-                    <div>
-                        <h3 class="font-semibold text-lg leading-loose text-gray-800">Client Account:
-                            {{ job.metadata.client.name }}
-                        </h3>
-                    </div>
-
-                    <div class="flex flex-shrink-0">
-                        <div v-for="(value, item) in job.metadata.job_taxonomy" class="flex flex-col">
-                            <div class="flex flex-wrap flex-shrink-0 text-xs items-center pr-3 text-xs mr-3">
-                                <div class="flex-grow h-full bg-gray-300 text-gray-600 px-2 rounded-l-lg">
-                                    <div class="grid h-full">
-                                        <div class="place-self-center">{{ item }}</div>
-                                    </div>
-                                </div>
-                                <div class="">
-
-                                    <div :class="job.metadata.matched_taxonomy[item].length ?
-                                                'bg-blue-200 text-green-800 px-2 rounded-tr-lg'
-                                                :'bg-blue-200 text-green-800 px-2 rounded-r-lg'"
-                                         title="MySGS value">{{ value }}
-                                    </div>
-
-                                    <div v-for="(terms, index) in job.metadata.matched_taxonomy[item]"
-                                         :class="(index === job.metadata.matched_taxonomy[item].length - 1) ?
-                                                    'bg-pink-200 text-green-800 px-2 rounded-br-lg'
-                                                    :'bg-pink-200 text-green-800 px-2'"
-                                         title="Matched Dagobah terms">
-                                        {{ terms }}<br>
-                                    </div>
-                                </div>
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+        <div v-if="searching">
+            <loader></loader>
         </div>
-
-        <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-2 bg-white">
-            <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-green-300" v-if="rulesUpdated">
-                <span class="text-xl inline-block mr-5 align-middle">
-                    <i class="fas fa-bell"/>
-                </span>
-                <span class="inline-block align-middle mr-8">
-                    <b class="capitalize">Hello!</b> Rules list updated. Do you want to check?
-                </span>
-                <button
-                    class="absolute bg-transparent text-2xl font-semibold leading-none right-0 top-0 mt-4 mr-6 outline-none focus:outline-none"
-                    @click="reloadPage">
-                    Reload
-                </button>
+        <div v-else-if="currentJob.metadata.processing_mysgs">
+            <loader></loader>
+        </div>
+        <div v-else-if="currentJob.metadata.client_found === false">
+            <div class="h-64 bg-white flex justify-center align-middle">
+                <p class="mt-16 text-red-700">"{{ currentJob.metadata.client.name }}" was not matched with any client
+                    account.</p>
             </div>
-
-            <div class="flex flex-wrap overflow-hidden sm:-mx-px md:-mx-px lg:-mx-px xl:-mx-px mb-2">
-
-                <div class="flex text-xs mx-2" role="group">
-                    <button @click="filterByNew"
-                            :class="[{ 'bg-blue-500 text-white' : filterOption === 'isNew' }, { 'bg-white text-blue-500' : filterOption !== 'isNew' }, 'hover:bg-blue-500 hover:text-white border border-r-0 border-blue-500 px-4 py-2 mx-0 outline-none focus:shadow-outline rounded-l-lg']">
-                        New
-                    </button>
-                    <button @click="filterByUpdated"
-                            :class="[{ 'bg-blue-500 text-white' : filterOption === 'isUpdated' }, { 'bg-white text-blue-500' : filterOption !== 'isUpdated' }, 'hover:bg-blue-500 hover:text-white border border-r-0 border-blue-500 px-4 py-2 mx-0 outline-none focus:shadow-outline']">
-                        Updated
-                    </button>
+        </div>
+        <div v-else-if="currentJob.metadata.error_mysgs">
+            There was an error loading data for the job "{{ currentJob.metadata.client.name }}".
+            <br>Please try again later.
+        </div>
+        <div v-else>
+            <job-identification :job="currentJob"/>
+
+            <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-2 bg-white">
+                <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-green-300" v-if="rulesUpdated">
+                    <span class="text-xl inline-block mr-5 align-middle">
+                        <i class="fas fa-bell"/>
+                    </span>
+                    <span class="inline-block align-middle mr-8">
+                        <b class="capitalize">Hello!</b> Rules list updated. Do you want to check?
+                    </span>
                     <button
-                        v-for="taxonomy in taxonomies"
-                        @click="filterByTaxonomy(taxonomy)"
-                        :class="[{ 'bg-blue-500 text-white' : filterOption === taxonomy }, { 'bg-white text-blue-500' : filterOption !== taxonomy  }, 'hover:bg-blue-500 hover:text-white border border-r-0 border-blue-500 px-4 py-2 mx-0 outline-none focus:shadow-outline']">
-                        {{ taxonomy }}
-                    </button>
-                    <button @click="$refs.cpt.unfilter()"
-                            class="bg-white text-blue-500 hover:bg-blue-500 hover:text-white border border-blue-500 px-4 py-2 mx-0 outline-none focus:shadow-outline rounded-r-lg">
-                        Unfilter
+                        class="absolute bg-transparent text-2xl font-semibold leading-none right-0 top-0 mt-4 mr-6 outline-none focus:outline-none"
+                        @click="reloadPage">
+                        Reload
                     </button>
                 </div>
 
-                <isotope ref="cpt" id="root_isotope" class="w-full m-2" :options='getOptions()'
-                         :list="Object.entries(rulesByTaxonomies)"
-                         @filter="filterOption=arguments[0]" @sort="sortOption=arguments[0]">
-
-                    <div class="w-1/3 rounded"
-                         v-for="(ruleGroup, ruleIndex) in Object.entries(rulesByTaxonomies)" :key="ruleIndex">
-                        <view-rule-item :rules="ruleGroup[1]" :group="ruleGroup[0]" :filter-flag="filterFlag"
-                                        @on-click-view="openRuleModal"/>
+                <div class="flex flex-wrap overflow-hidden sm:-mx-px md:-mx-px lg:-mx-px xl:-mx-px mb-2">
+
+                    <div class="flex text-xs mx-2" role="group">
+                        <button @click="filterByNew"
+                                class="hover:bg-blue-500 hover:text-white border border-r-0 border-blue-500 px-1 py-2 mx-0 outline-none focus:shadow-outline rounded-l-lg"
+                                :class="[
+                                    { 'bg-blue-500 text-white' : filterOption === 'isNew' },
+                                    { 'bg-white text-blue-500' : filterOption !== 'isNew' }
+                                ]">
+                            New
+                        </button>
+                        <button @click="filterByUpdated"
+                                class="hover:bg-blue-500 hover:text-white border border-r-0 border-blue-500 px-1 py-2 mx-0 outline-none focus:shadow-outline"
+                                :class="[
+                                    { 'bg-blue-500 text-white' : filterOption === 'isUpdated' },
+                                    { 'bg-white text-blue-500' : filterOption !== 'isUpdated' }
+                                ]">
+                            Updated
+                        </button>
+                        <button
+                            v-for="taxonomy in taxonomies"
+                            @click="filterByTaxonomy(taxonomy)"
+                            class="hover:bg-blue-500 hover:text-white border border-r-0 border-blue-500 px-1 py-2 mx-0 outline-none focus:shadow-outline"
+                            :class="[
+                                { 'bg-blue-500 text-white' : filterOption === taxonomy },
+                                 { 'bg-white text-blue-500' : filterOption !== taxonomy  }, ]">
+                            {{ taxonomy }}
+                        </button>
+                        <button @click="$refs.cpt.unfilter()"
+                                class="bg-white text-blue-500 hover:bg-blue-500 hover:text-white border border-blue-500 px-1 py-2 mx-0 outline-none focus:shadow-outline rounded-r-lg">
+                            Unfilter
+                        </button>
                     </div>
 
-                </isotope>
+                    <isotope ref="cpt" id="root_isotope" class="w-full m-2" :options='getOptions()'
+                             :list="Object.entries(rulesByTaxonomies)"
+                             @filter="filterOption=arguments[0]" @sort="sortOption=arguments[0]">
+
+                        <div class="w-1/3 rounded"
+                             v-for="(ruleGroup, ruleIndex) in Object.entries(rulesByTaxonomies)" :key="ruleIndex">
+                            <view-rule-item :rules="ruleGroup[1]" :group="ruleGroup[0]" :filter-flag="filterFlag"
+                                            @on-click-view="openRuleModal"/>
+                        </div>
 
+                    </isotope>
+
+                </div>
             </div>
         </div>
 
@@ -152,7 +142,7 @@
         <!-- Rule Flagging Modal -->
         <jet-dialog-modal :show="isFlaggingRule" @close="closeFlagModal">
             <template #title>
-                <span v-if="currentFlaggingRule">Flag rule {{currentFlaggingRule.name}}</span>
+                <span v-if="currentFlaggingRule">Flag rule {{ currentFlaggingRule.name }}</span>
             </template>
             <template #content>
                 <div class="mt-4">
@@ -160,9 +150,9 @@
                     <textarea class="form-input rounded-md shadow-sm mt-1 block w-full" id="reason"
                               placeholder="Please provide a short explanation"
                               v-model="flagRuleForm.reason"/>
-<!--                    <jet-input type="text" class="mt-1 block w-3/4"
-                               :value="flagRuleForm.reason"
-                               v-model="flagRuleForm.reason"/>-->
+                    <!--                    <jet-input type="text" class="mt-1 block w-3/4"
+                                                   :value="flagRuleForm.reason"
+                                                   v-model="flagRuleForm.reason"/>-->
 
                 </div>
             </template>
@@ -172,8 +162,8 @@
                 </jet-secondary-button>
 
                 <jet-danger-button class="ml-2" @click.native="sendFlagRule"
-                            :class="{ 'opacity-25': flagRuleForm.processing }"
-                            :disabled="flagRuleForm.processing">
+                                   :class="{ 'opacity-25': flagRuleForm.processing }"
+                                   :disabled="flagRuleForm.processing">
                     Flag
                 </jet-danger-button>
             </template>
@@ -194,11 +184,13 @@ import JetDialogModal from '@/Jetstream/DialogModal';
 import JetInput from '@/Jetstream/Input'
 import JetLabel from '@/Jetstream/Label'
 import JetSecondaryButton from '@/Jetstream/SecondaryButton'
+import Loader from "@/Components/Loader";
 import ViewRule from '@/Components/PM/Rules/ViewRule'
 import ViewRuleItem from "@/Components/PM/Rules/ViewRuleItem";
 import JobSearch from "@/Components/OP/JobSearchForm";
 import isotope from 'vueisotope'
 import moment from "moment";
+import JobIdentification from "@/Components/OP/JobIdentification";
 
 export default {
     props: [
@@ -210,9 +202,11 @@ export default {
 
     data() {
         return {
+            currentJob: this.job,
+            currentRules: this.rules,
             searchJobKey: this.jobNumber,
             searching: false,
-            searchedRules: [..._.orderBy(this.rules, 'created_at', 'desc')],
+            searchedRules: [this.currentRules],
             isOpen: false,
             currentRule: null,
             rulesUpdated: false,
@@ -246,42 +240,96 @@ export default {
                         this.rulesUpdated = true;
                     });
             }
+        },
+
+        jobNumber: function (newJobNumber, oldJobNumber) {
+            console.log('detected job number change');
+            this.initJobLoaded();
         }
     },
 
     created() {
 
-        this.searchedRules.forEach(rule => {
-            rule.terms.forEach(term => {
-                if (term.taxonomy.parent.name === 'Job Categorizations') {
-                    if (!this.taxonomies.includes(term.taxonomy.name)) {
-                        this.taxonomies.push(term.taxonomy.name);
-                    }
+    },
 
-                    if (this.rulesByTaxonomies[term.taxonomy.name] === undefined) {
-                        this.rulesByTaxonomies[term.taxonomy.name] = [];
-                    }
+    mounted() {
+        this.initJobLoaded();
+    },
 
-                    this.rulesByTaxonomies[term.taxonomy.name].push(rule);
-                }
-            });
-            this.taxonomies.forEach(taxonomy => {
-                this.filterObject[taxonomy] = itemElem => {
-                    return itemElem[0] === taxonomy;
-                }
+    destroyed() {
+        clearTimeout(this.timeOut);
+    },
+
+    methods: {
+        initJobLoaded() {
+            this.currentJob = this.job;
+            if (this.currentJob.metadata.processing_mysgs === false) {
+                this.currentRules = this.rules;
+                this.newRulesLoaded();
+                this.initRulesParsing();
+            } else {
+                this.waitMode();
+            }
+
+            this.initSearchFunctions();
+        },
+
+        initRulesParsing() {
+            this.searchedRules.forEach(rule => {
+                rule.terms.forEach(term => {
+                    if (term.taxonomy.parent.name === 'Job Categorizations') {
+                        if (!this.taxonomies.includes(term.taxonomy.name)) {
+                            this.taxonomies.push(term.taxonomy.name);
+                        }
+
+                        if (this.rulesByTaxonomies[term.taxonomy.name] === undefined) {
+                            this.rulesByTaxonomies[term.taxonomy.name] = [];
+                        }
+
+                        this.rulesByTaxonomies[term.taxonomy.name].push(rule);
+                    }
+                });
+                this.taxonomies.forEach(taxonomy => {
+                    this.filterObject[taxonomy] = itemElem => {
+                        return itemElem[0] === taxonomy;
+                    }
+                });
             });
-        });
+        },
 
-        this.filterObject['isNew'] = (itemElem) => {
-            return itemElem[1].filter(rule => moment().subtract(3, 'months').isSameOrBefore(moment(rule.created_at))).length > 0;
-        };
+        initSearchFunctions() {
+            this.filterObject['isNew'] = (itemElem) => {
+                return itemElem[1].filter(rule => moment().subtract(3, 'months').isSameOrBefore(moment(rule.created_at))).length > 0;
+            };
 
-        this.filterObject['isUpdated'] = (itemElem) => {
-            return itemElem[1].filter(rule => moment().subtract(3, 'months').isSameOrBefore(moment(rule.updated_at))).length > 0;
-        };
-    },
+            this.filterObject['isUpdated'] = (itemElem) => {
+                return itemElem[1].filter(rule => moment().subtract(3, 'months').isSameOrBefore(moment(rule.updated_at))).length > 0;
+            };
+        },
+
+        waitMode() {
+            this.timeOut = setTimeout(() => {
+                this.queryRules();
+            }, 5000);
+        },
+
+        queryRules() {
+            axios.get(route('job.rules', this.jobNumber))
+                .then(({data}) => {
+                    console.log(data);
+                    if (!data.job.metadata.processing_mysgs) {
+                        clearTimeout(this.timeOut);
+
+                        this.currentJob = data.job;
+                        this.currentRules = data.rules;
+                        this.newRulesLoaded();
+                        this.initRulesParsing();
+                    } else {
+                        this.waitMode();
+                    }
+                })
+        },
 
-    methods: {
         getOptions() {
             return {
                 layoutMode: 'masonry',
@@ -294,8 +342,15 @@ export default {
                 getFilterData: this.filterObject
             }
         },
-        newJobLoaded() {
-            this.searchedRules = [...this.rules];
+        newRulesLoaded() {
+            this.searchedRules = [..._.orderBy(this.currentRules, 'created_at', 'desc')];
+            this.searching = false;
+        },
+        runningSearch() {
+            this.currentJob = {metadata: {}};
+            this.searching = true;
+            this.taxonomies = [];
+            this.rulesByTaxonomies = {};
         },
         reloadPage() {
             window.location = window.location + this.searchJobKey;
@@ -308,22 +363,6 @@ export default {
             this.isOpen = false;
             this.currentRule = null;
         },
-        search() {
-            if (this.searchJobKey && this.searchJobKey !== '') {
-                this.searching = true;
-                axios({
-                    url: route("rule_search", this.searchJobKey),
-                    method: "GET",
-                })
-                    .then(result => {
-                        this.searchedRules = result.data;
-                        this.searching = false;
-                    })
-                    .catch(err => {
-                        this.searching = false;
-                    });
-            }
-        },
         filterByNew() {
             this.$refs.cpt.filter('isNew');
             this.filterFlag = "new";
@@ -354,7 +393,7 @@ export default {
                 preserveScroll: true
             }).then(() => {
 
-                    this.closeFlagModal();
+                this.closeFlagModal();
             });
         },
 
@@ -362,6 +401,7 @@ export default {
     },
 
     components: {
+        JobIdentification,
         ViewRuleItem,
         Button,
         Input,
@@ -373,9 +413,11 @@ export default {
         JetInput,
         JetLabel,
         JetSecondaryButton,
+        Loader,
         ViewRule,
         JobSearch,
         isotope
     },
 }
 </script>
+
diff --git a/routes/web.php b/routes/web.php
index e762fa29..d9be680d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -22,9 +22,7 @@
 |
 */
 
-/*Route::get('/', function () {
-    return view('welcome');
-})->name('home');*/
+Route::get('/', [\App\Http\Controllers\HomeController::class, 'index'])->name('home');
 
 Route::middleware(['auth:sanctum', 'verified'])->group(function () {
     Route::get('/dashboard', function () {
@@ -33,6 +31,23 @@
 
     Route::put('/current-team', [CurrentTeamController::class, 'update'])
         ->name('current-team.update');
+
+    Route::get( '/{jobNumber?}', [\App\Http\Controllers\OPs\JobController::class, 'show'])
+        ->name('job.rules')
+        ->where('jobNumber', '[0-9]+');
+
+    Route::post( '/{jobNumber?}', [\App\Http\Controllers\OPs\JobController::class, 'search'])
+        ->name('job.search')
+        ->where('jobNumber', '[0-9]+');
+
+
+    Route::post('/rule/{rule}/flag', [\App\Http\Controllers\RuleFlaggingController::class, 'flag'])
+        ->name('rule.flag')
+        ->where('rule', '[0-9]+');
+
+    Route::post('/rule/{rule}/unflag', [\App\Http\Controllers\RuleFlaggingController::class, 'unflag'])
+        ->name('rule.unflag')
+        ->where('rule', '[0-9]+');
 });
 
 Route::name('pm.')
@@ -135,30 +150,6 @@
     });
 
 
-Route::group([
-    'middleware' => [
-        'auth:sanctum',
-        'verified',
-        'cache.headers:public;max_age=3600;etag',
-    ],
-    //'prefix' => 'op/'
-],
-    function () {
-        Route::match(['get', 'post'], '/{jobNumber?}', [\App\Http\Controllers\OPs\JobController::class, 'show'])
-            ->name('home')
-            ->where('jobNumber', '[0-9]+');
-
-
-        Route::post('/rule/{rule}/flag', [\App\Http\Controllers\RuleFlaggingController::class, 'flag'])
-            ->name('rule.flag')
-            ->where('rule', '[0-9]+');
-
-        Route::post('/rule/{rule}/unflag', [\App\Http\Controllers\RuleFlaggingController::class, 'unflag'])
-            ->name('rule.unflag')
-            ->where('rule', '[0-9]+');
-    });
-
-
 Route::get('nova/login', function () {
     return redirect('/login/microsoft');
 })->name('nova.login');