Bug fix. Wrong label key
Improve extraction of overridable parameters