Changes to prevent duplicate widget initialization
Code improvements
the property name for w-id should be preserved