Task query fixed