- BZ-982955 updating task queries to fix ordering issue