org: Correct filling of lists etc