FIX: output None only if empty dict/list