added more i18n, added where deleted at on queries