Add queryPattern to jobType and changes to query structure