CMS-2397 Make indexed properties follow hierarchy of form-items