BETA Review of i18n and search (plus other fixes).