Cam 1724

Implementation of extended query functions for TaskQueries
JIRA: CAM-1724