SWITCHYARD-2210 - Fix for advanced property editing problems