Add task_id to query to match check_timeout()
Merge pull request #3 from nealclark/master

Add task_id to query to match check_timeout()