Job editing issues fixes