fixing i18n and user orm queries