(GFW-354) Added some more validation for list items