Fix list so it supports also non element nodes