Added list field support
Fixed undefined index notice