Capture Department Code and Job Category

Updates to capture job category and department code when present.