Merge "Add task to list before looking it up." into klp-dev