SWITCHYARD-1609 tweak labels and fix validation errors on custom props