Add missing properties and disable on not selected