Fixed parsing of fields with alternative values + typo fix