return ``id`` for jobs, rather than ``job_id`` in resultsets.  updated regexes