Fix changed settings key name
Fix HTML label ID issue