Correctly handle missing lists
Correctly handle top level lists