Fix validation error; collapsing section for properties