Add help text and labels for property types
Merge branch 'tiered-sort' into staging2