fixing invalid syntax to Any() which broke the type testing
Adding missing columns to job, specified as optionals since the queue is not passing them on yet.  Also adding some TODOs