Added searching for tasks