fix: prepass list to remove emtpy items