Bugfix/task list issues