[FIX]: site in the job definition is taken into account when submitting

Porting back from v6r8 (tested)