Fix storage of control values and reporting of all property values