fixed validation errors
push as requested
fixed empty item
merge