Remove 'Enable enhanced country select boxes' setting and replace with filter #6589