fix underscore properties and array properties