Task list : query enhancement