change item parsing to match unit parsing