Add query and extract job

Is there a reason you're not doing `is not None` for certain kwargs?