L10N Improvements Part 3 - More Fixes
L10N Part 4: flag-based selection