Added hierarchical task search