Fixes for drill-down, improvements for i18n