Added task name to some queries