[RJA-2022] [fix] - Restore selected values when rerendering properties