fix bad find and replace, fix privacy selector not being i18n friendly