Fix task queries... :)