diff --git a/.eslintrc.json b/.eslintrc.json
index 7a824ff6ca..25e83d5acd 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -50,7 +50,8 @@
     "@next/next/no-img-element": "off",
     "@typescript-eslint/no-empty-function": "off",
     "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-var-requires": "off"
+    "@typescript-eslint/no-var-requires": "off",
+    "@typescript-eslint/no-empty-interface": "off"
   },
   "globals": {
     "React": "writable"
diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index bf2505b14f..24711fba7e 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -19,4 +19,6 @@ jobs:
           close-issue-message: 'This issue was closed because it has been inactive for 7 days since being marked as stale.'
           days-before-pr-stale: -1
           days-before-pr-close: -1
+          operations-per-run: 200
+          ascending: true
           repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/assets/magnet.svg b/assets/magnet.svg
new file mode 100644
index 0000000000..3c64c3ee57
--- /dev/null
+++ b/assets/magnet.svg
@@ -0,0 +1 @@
+<svg height="512" viewBox="0 0 508.467 508.467" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m426.815 239.006c-11.722-11.724-30.702-11.729-42.427-.001-65.928 65.929 49.291-49.292-116.718 116.718-53.811 53.809-142.478 19.197-140.68-54.511.547-22.415 9.826-43.738 26.129-60.041l116.717-116.717c11.724-11.722 11.728-30.702 0-42.427l-46.668-46.669c-11.725-11.725-30.702-11.726-42.427 0-16.642 16.643-102.078 102.078-120.112 120.112-39.05 39.05-60.582 90.97-60.629 146.195-.093 110.827 88.182 206.288 206.244 206.394 56.778 0 109.204-21.924 148.29-61.01l118.948-118.948c11.724-11.722 11.728-30.702 0-42.427zm-224.861-182.434 46.669 46.669-58.455 58.456-46.669-46.669zm131.367 369.264c-69.043 69.043-182.868 70.02-251.708.933-68.763-69.009-68.66-181.196.229-250.086l40.443-40.443 46.669 46.669-37.049 37.049c-45.115 45.112-46.916 116.85-3.395 160.371 43.279 43.279 115.221 41.756 160.372-3.394l37.049-37.049 46.669 46.669zm60.494-60.493-46.669-46.669 58.456-58.456 46.669 46.669z"/><path d="m379.357 95.099c15.199 3.839 30.418 19.07 34.336 34.192 2.089 8.058 10.303 12.828 18.283 10.758 8.02-2.078 12.836-10.264 10.758-18.283-6.651-25.662-30.176-49.223-56.03-55.753-8.032-2.027-16.188 2.838-18.217 10.869-2.029 8.032 2.837 16.189 10.87 18.217z"/><path d="m507.984 102.124c-12.016-46.375-55.215-89.504-101.745-101.256-8.032-2.027-16.188 2.838-18.217 10.869-2.029 8.032 2.838 16.188 10.87 18.217 35.882 9.063 70.769 43.871 80.051 79.695 2.088 8.058 10.304 12.828 18.283 10.758 8.02-2.078 12.836-10.263 10.758-18.283z"/></g></svg>
\ No newline at end of file
diff --git a/components/common/Pager.js b/components/common/Pager.js
new file mode 100644
index 0000000000..aaeffbaeca
--- /dev/null
+++ b/components/common/Pager.js
@@ -0,0 +1,45 @@
+import styles from './Pager.module.css';
+import { Button, Flexbox, Icon, Icons } from 'react-basics';
+import useMessages from 'hooks/useMessages';
+
+export function Pager({ page, pageSize, count, onPageChange }) {
+  const { formatMessage, labels } = useMessages();
+  const maxPage = Math.ceil(count / pageSize);
+  const lastPage = page === maxPage;
+  const firstPage = page === 1;
+
+  if (count === 0) {
+    return null;
+  }
+
+  const handlePageChange = value => {
+    const nextPage = page + value;
+    if (nextPage > 0 && nextPage <= maxPage) {
+      onPageChange(nextPage);
+    }
+  };
+
+  if (maxPage === 1) {
+    return null;
+  }
+
+  return (
+    <Flexbox justifyContent="center" className={styles.container}>
+      <Button onClick={() => handlePageChange(-1)} disabled={firstPage}>
+        <Icon rotate={90}>
+          <Icons.ChevronDown />
+        </Icon>
+      </Button>
+      <Flexbox alignItems="center" className={styles.text}>
+        {formatMessage(labels.pageOf, { current: page, total: maxPage })}
+      </Flexbox>
+      <Button onClick={() => handlePageChange(1)} disabled={lastPage}>
+        <Icon rotate={270}>
+          <Icons.ChevronDown />
+        </Icon>
+      </Button>
+    </Flexbox>
+  );
+}
+
+export default Pager;
diff --git a/components/common/Pager.module.css b/components/common/Pager.module.css
new file mode 100644
index 0000000000..99eb70ce0a
--- /dev/null
+++ b/components/common/Pager.module.css
@@ -0,0 +1,7 @@
+.container {
+  margin-top: 20px;
+}
+
+.text {
+  margin: 0 16px;
+}
diff --git a/components/common/SettingsTable.js b/components/common/SettingsTable.js
index 8f03985849..e9491331e0 100644
--- a/components/common/SettingsTable.js
+++ b/components/common/SettingsTable.js
@@ -1,37 +1,99 @@
-import { Table, TableHeader, TableBody, TableRow, TableCell, TableColumn } from 'react-basics';
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
+import useMessages from 'hooks/useMessages';
+import { useState } from 'react';
+import {
+  SearchField,
+  Table,
+  TableBody,
+  TableCell,
+  TableColumn,
+  TableHeader,
+  TableRow,
+} from 'react-basics';
 import styles from './SettingsTable.module.css';
+import Pager from 'components/common/Pager';
+
+export function SettingsTable({
+  columns = [],
+  data,
+  children,
+  cellRender,
+  showSearch,
+  showPaging,
+  onFilterChange,
+  onPageChange,
+  onPageSizeChange,
+  filterValue,
+}) {
+  const { formatMessage, messages } = useMessages();
+  const [filter, setFilter] = useState(filterValue);
+  const { data: value, page, count, pageSize } = data;
+
+  const handleFilterChange = value => {
+    setFilter(value);
+    onFilterChange(value);
+  };
 
-export function SettingsTable({ columns = [], data = [], children, cellRender }) {
   return (
-    <Table columns={columns} rows={data}>
-      <TableHeader className={styles.header}>
-        {(column, index) => {
-          return (
-            <TableColumn key={index} className={styles.cell} style={columns[index].style}>
-              {column.label}
-            </TableColumn>
-          );
-        }}
-      </TableHeader>
-      <TableBody className={styles.body}>
-        {(row, keys, rowIndex) => {
-          row.action = children(row, keys, rowIndex);
+    <>
+      {showSearch && (
+        <SearchField
+          onChange={handleFilterChange}
+          delay={1000}
+          value={filter}
+          autoFocus={true}
+          placeholder="Search"
+          style={{ maxWidth: '300px', marginBottom: '10px' }}
+        />
+      )}
+      {value.length === 0 && filterValue && (
+        <EmptyPlaceholder message={formatMessage(messages.noResultsFound)}></EmptyPlaceholder>
+      )}
+      {value.length > 0 && (
+        <Table columns={columns} rows={value}>
+          <TableHeader className={styles.header}>
+            {(column, index) => {
+              return (
+                <TableColumn key={index} className={styles.cell} style={columns[index].style}>
+                  {column.label}
+                </TableColumn>
+              );
+            }}
+          </TableHeader>
+          <TableBody className={styles.body}>
+            {(row, keys, rowIndex) => {
+              row.action = children(row, keys, rowIndex);
 
-          return (
-            <TableRow key={rowIndex} data={row} keys={keys} className={styles.row}>
-              {(data, key, colIndex) => {
-                return (
-                  <TableCell key={colIndex} className={styles.cell} style={columns[colIndex].style}>
-                    <label className={styles.label}>{columns[colIndex].label}</label>
-                    {cellRender ? cellRender(row, data, key, colIndex) : data[key]}
-                  </TableCell>
-                );
-              }}
-            </TableRow>
-          );
-        }}
-      </TableBody>
-    </Table>
+              return (
+                <TableRow key={rowIndex} data={row} keys={keys} className={styles.row}>
+                  {(data, key, colIndex) => {
+                    return (
+                      <TableCell
+                        key={colIndex}
+                        className={styles.cell}
+                        style={columns[colIndex].style}
+                      >
+                        <label className={styles.label}>{columns[colIndex].label}</label>
+                        {cellRender ? cellRender(row, data, key, colIndex) : data[key]}
+                      </TableCell>
+                    );
+                  }}
+                </TableRow>
+              );
+            }}
+          </TableBody>
+          {showPaging && (
+            <Pager
+              page={page}
+              pageSize={pageSize}
+              count={count}
+              onPageChange={onPageChange}
+              onPageSizeChange={onPageSizeChange}
+            />
+          )}
+        </Table>
+      )}
+    </>
   );
 }
 
diff --git a/components/icons.ts b/components/icons.ts
index e42b15feef..01d7caf5ad 100644
--- a/components/icons.ts
+++ b/components/icons.ts
@@ -11,6 +11,7 @@ import Gear from 'assets/gear.svg';
 import Globe from 'assets/globe.svg';
 import Lock from 'assets/lock.svg';
 import Logo from 'assets/logo.svg';
+import Magnet from 'assets/magnet.svg';
 import Moon from 'assets/moon.svg';
 import Nodes from 'assets/nodes.svg';
 import Overview from 'assets/overview.svg';
@@ -35,6 +36,7 @@ const icons = {
   Globe,
   Lock,
   Logo,
+  Magnet,
   Moon,
   Nodes,
   Overview,
diff --git a/components/input/DateFilter.js b/components/input/DateFilter.js
index 7fc4319de1..af4b69ddec 100644
--- a/components/input/DateFilter.js
+++ b/components/input/DateFilter.js
@@ -3,7 +3,7 @@ import { Icon, Modal, Dropdown, Item, Text, Flexbox } from 'react-basics';
 import { endOfYear, isSameDay } from 'date-fns';
 import DatePickerForm from 'components/metrics/DatePickerForm';
 import useLocale from 'hooks/useLocale';
-import { dateFormat } from 'lib/date';
+import { formatDate } from 'lib/date';
 import Icons from 'components/icons';
 import useMessages from 'hooks/useMessages';
 
@@ -135,8 +135,8 @@ const CustomRange = ({ startDate, endDate, onClick }) => {
         <Icons.Calendar />
       </Icon>
       <Text>
-        {dateFormat(startDate, 'd LLL y', locale)}
-        {!isSameDay(startDate, endDate) && ` — ${dateFormat(endDate, 'd LLL y', locale)}`}
+        {formatDate(startDate, 'd LLL y', locale)}
+        {!isSameDay(startDate, endDate) && ` — ${formatDate(endDate, 'd LLL y', locale)}`}
       </Text>
     </Flexbox>
   );
diff --git a/components/input/MonthSelect.js b/components/input/MonthSelect.js
new file mode 100644
index 0000000000..88373fddfe
--- /dev/null
+++ b/components/input/MonthSelect.js
@@ -0,0 +1,71 @@
+import { useRef } from 'react';
+import {
+  Text,
+  Icon,
+  CalendarMonthSelect,
+  CalendarYearSelect,
+  Button,
+  PopupTrigger,
+  Popup,
+} from 'react-basics';
+import { startOfMonth, endOfMonth } from 'date-fns';
+import Icons from 'components/icons';
+import { useLocale } from 'hooks';
+import { formatDate } from 'lib/date';
+import { getDateLocale } from 'lib/lang';
+import styles from './MonthSelect.module.css';
+
+export function MonthSelect({ date = new Date(), onChange }) {
+  const { locale } = useLocale();
+  const month = formatDate(date, 'MMMM', locale);
+  const year = date.getFullYear();
+  const ref = useRef();
+
+  const handleChange = (close, date) => {
+    onChange(`range:${startOfMonth(date).getTime()}:${endOfMonth(date).getTime()}`);
+    close();
+  };
+
+  return (
+    <>
+      <div ref={ref} className={styles.container}>
+        <PopupTrigger>
+          <Button className={styles.input} variant="quiet">
+            <Text>{month}</Text>
+            <Icon size="sm">
+              <Icons.ChevronDown />
+            </Icon>
+          </Button>
+          <Popup className={styles.popup} alignment="start">
+            {close => (
+              <CalendarMonthSelect
+                date={date}
+                locale={getDateLocale(locale)}
+                onSelect={handleChange.bind(null, close)}
+              />
+            )}
+          </Popup>
+        </PopupTrigger>
+        <PopupTrigger>
+          <Button className={styles.input} variant="quiet">
+            <Text>{year}</Text>
+            <Icon size="sm">
+              <Icons.ChevronDown />
+            </Icon>
+          </Button>
+          <Popup className={styles.popup} alignment="start">
+            {close => (
+              <CalendarYearSelect
+                date={date}
+                locale={getDateLocale(locale)}
+                onSelect={handleChange.bind(null, close)}
+              />
+            )}
+          </Popup>
+        </PopupTrigger>
+      </div>
+    </>
+  );
+}
+
+export default MonthSelect;
diff --git a/components/input/MonthSelect.module.css b/components/input/MonthSelect.module.css
new file mode 100644
index 0000000000..3b13bcc180
--- /dev/null
+++ b/components/input/MonthSelect.module.css
@@ -0,0 +1,22 @@
+.container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid var(--base400);
+  border-radius: var(--border-radius);
+}
+
+.input {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  cursor: pointer;
+}
+
+.popup {
+  border: 1px solid var(--base400);
+  background: var(--base50);
+  border-radius: var(--border-radius);
+  padding: 20px;
+  margin-top: 5px;
+}
diff --git a/components/input/WebsiteSelect.js b/components/input/WebsiteSelect.js
index b77ae57c80..ae3ceb46a3 100644
--- a/components/input/WebsiteSelect.js
+++ b/components/input/WebsiteSelect.js
@@ -8,12 +8,12 @@ export function WebsiteSelect({ websiteId, onSelect }) {
   const { data } = useQuery(['websites:me'], () => get('/me/websites'));
 
   const renderValue = value => {
-    return data?.find(({ id }) => id === value)?.name;
+    return data?.data?.find(({ id }) => id === value)?.name;
   };
 
   return (
     <Dropdown
-      items={data}
+      items={data?.data}
       value={websiteId}
       renderValue={renderValue}
       onChange={onSelect}
diff --git a/components/layout/AppLayout.js b/components/layout/AppLayout.js
index 989128f9e4..7ab74351b7 100644
--- a/components/layout/AppLayout.js
+++ b/components/layout/AppLayout.js
@@ -2,9 +2,7 @@ import { Container } from 'react-basics';
 import Head from 'next/head';
 import NavBar from 'components/layout/NavBar';
 import UpdateNotice from 'components/common/UpdateNotice';
-import useRequireLogin from 'hooks/useRequireLogin';
-import useConfig from 'hooks/useConfig';
-import { CURRENT_VERSION } from 'lib/constants';
+import { useRequireLogin, useConfig } from 'hooks';
 import styles from './AppLayout.module.css';
 
 export function AppLayout({ title, children }) {
@@ -16,7 +14,7 @@ export function AppLayout({ title, children }) {
   }
 
   return (
-    <div className={styles.layout} data-app-version={CURRENT_VERSION}>
+    <div className={styles.layout}>
       <UpdateNotice user={user} config={config} />
       <Head>
         <title>{title ? `${title} | umami` : 'umami'}</title>
diff --git a/components/layout/AppLayout.module.css b/components/layout/AppLayout.module.css
index 0afd11f9fe..be51f83cf4 100644
--- a/components/layout/AppLayout.module.css
+++ b/components/layout/AppLayout.module.css
@@ -10,6 +10,7 @@
   width: 100vw;
   grid-column: 1;
   grid-row: 1 / 2;
+  z-index: 1;
 }
 
 .body {
diff --git a/components/layout/NavBar.js b/components/layout/NavBar.js
index 97eaa46c3d..e896b40461 100644
--- a/components/layout/NavBar.js
+++ b/components/layout/NavBar.js
@@ -18,6 +18,8 @@ export function NavBar() {
 
   const links = [
     { label: formatMessage(labels.dashboard), url: '/dashboard' },
+    { label: formatMessage(labels.websites), url: '/websites' },
+    { label: formatMessage(labels.reports), url: '/reports' },
     !cloudMode && { label: formatMessage(labels.settings), url: '/settings' },
   ].filter(n => n);
 
diff --git a/components/layout/SettingsLayout.module.css b/components/layout/SettingsLayout.module.css
index 569b903ba6..36d029f02c 100644
--- a/components/layout/SettingsLayout.module.css
+++ b/components/layout/SettingsLayout.module.css
@@ -2,6 +2,7 @@
   display: flex;
   flex-direction: column;
   padding-top: 40px;
+  padding-right: 20px;
 }
 
 .content {
diff --git a/components/messages.js b/components/messages.js
index a31e287518..ff61994506 100644
--- a/components/messages.js
+++ b/components/messages.js
@@ -21,6 +21,8 @@ export const labels = defineMessages({
   details: { id: 'label.details', defaultMessage: 'Details' },
   website: { id: 'label.website', defaultMessage: 'Website' },
   websites: { id: 'label.websites', defaultMessage: 'Websites' },
+  myWebsites: { id: 'label.my-websites', defaultMessage: 'My websites' },
+  teamWebsites: { id: 'label.team-websites', defaultMessage: 'Team websites' },
   created: { id: 'label.created', defaultMessage: 'Created' },
   edit: { id: 'label.edit', defaultMessage: 'Edit' },
   name: { id: 'label.name', defaultMessage: 'Name' },
@@ -28,6 +30,7 @@ export const labels = defineMessages({
   accessCode: { id: 'label.access-code', defaultMessage: 'Access code' },
   teamId: { id: 'label.team-id', defaultMessage: 'Team ID' },
   team: { id: 'label.team', defaultMessage: 'Team' },
+  teamName: { id: 'label.team-name', defaultMessage: 'Team name' },
   regenerate: { id: 'label.regenerate', defaultMessage: 'Regenerate' },
   remove: { id: 'label.remove', defaultMessage: 'Remove' },
   join: { id: 'label.join', defaultMessage: 'Join' },
@@ -77,7 +80,7 @@ export const labels = defineMessages({
   referrers: { id: 'label.referrers', defaultMessage: 'Referrers' },
   screens: { id: 'label.screens', defaultMessage: 'Screens' },
   browsers: { id: 'label.browsers', defaultMessage: 'Browsers' },
-  os: { id: 'label.operating-systems', defaultMessage: 'Operating systems' },
+  os: { id: 'label.os', defaultMessage: 'OS' },
   devices: { id: 'label.devices', defaultMessage: 'Devices' },
   countries: { id: 'label.countries', defaultMessage: 'Countries' },
   languages: { id: 'label.languages', defaultMessage: 'Languages' },
@@ -133,35 +136,48 @@ export const labels = defineMessages({
   runQuery: { id: 'label.run-query', defaultMessage: 'Run query' },
   field: { id: 'label.field', defaultMessage: 'Field' },
   fields: { id: 'label.fields', defaultMessage: 'Fields' },
-  createReport: { id: 'labels.create-report', defaultMessage: 'Create report' },
-  description: { id: 'labels.description', defaultMessage: 'Description' },
-  untitled: { id: 'labels.untitled', defaultMessage: 'Untitled' },
-  type: { id: 'labels.type', defaultMessage: 'Type' },
-  filters: { id: 'labels.filters', defaultMessage: 'Filters' },
-  breakdown: { id: 'labels.breakdown', defaultMessage: 'Breakdown' },
-  true: { id: 'labels.true', defaultMessage: 'True' },
-  false: { id: 'labels.false', defaultMessage: 'False' },
-  equals: { id: 'labels.equals', defaultMessage: 'Equals' },
-  doesNotEqual: { id: 'labels.does-not-equal', defaultMessage: 'Does not equal' },
-  greaterThan: { id: 'labels.greater-than', defaultMessage: 'Greater than' },
-  lessThan: { id: 'labels.less-than', defaultMessage: 'Less than' },
-  greaterThanEquals: { id: 'labels.greater-than-equals', defaultMessage: 'Greater than or equals' },
-  lessThanEquals: { id: 'labels.less-than-equals', defaultMessage: 'Less than or equals' },
-  contains: { id: 'labels.contains', defaultMessage: 'Contains' },
-  doesNotContain: { id: 'labels.does-not-contain', defaultMessage: 'Does not contain' },
-  before: { id: 'labels.before', defaultMessage: 'Before' },
-  after: { id: 'labels.after', defaultMessage: 'After' },
-  total: { id: 'labels.total', defaultMessage: 'Total' },
-  sum: { id: 'labels.sum', defaultMessage: 'Sum' },
-  average: { id: 'labels.average', defaultMessage: 'Average' },
-  min: { id: 'labels.min', defaultMessage: 'Min' },
-  max: { id: 'labels.max', defaultMessage: 'Max' },
-  unique: { id: 'labels.unique', defaultMessage: 'Unique' },
-  value: { id: 'labels.value', defaultMessage: 'Value' },
-  overview: { id: 'labels.overview', defaultMessage: 'Overview' },
-  totalRecords: { id: 'labels.total-records', defaultMessage: 'Total records' },
+  createReport: { id: 'label.create-report', defaultMessage: 'Create report' },
+  description: { id: 'label.description', defaultMessage: 'Description' },
+  untitled: { id: 'label.untitled', defaultMessage: 'Untitled' },
+  type: { id: 'label.type', defaultMessage: 'Type' },
+  filters: { id: 'label.filters', defaultMessage: 'Filters' },
+  breakdown: { id: 'label.breakdown', defaultMessage: 'Breakdown' },
+  true: { id: 'label.true', defaultMessage: 'True' },
+  false: { id: 'label.false', defaultMessage: 'False' },
+  is: { id: 'label.is', defaultMessage: 'Is' },
+  isNot: { id: 'label.is-not', defaultMessage: 'Is not' },
+  isSet: { id: 'label.is-set', defaultMessage: 'Is set' },
+  isNotSet: { id: 'label.is-not-set', defaultMessage: 'Is not set' },
+  greaterThan: { id: 'label.greater-than', defaultMessage: 'Greater than' },
+  lessThan: { id: 'label.less-than', defaultMessage: 'Less than' },
+  greaterThanEquals: { id: 'label.greater-than-equals', defaultMessage: 'Greater than or equals' },
+  lessThanEquals: { id: 'label.less-than-equals', defaultMessage: 'Less than or equals' },
+  contains: { id: 'label.contains', defaultMessage: 'Contains' },
+  doesNotContain: { id: 'label.does-not-contain', defaultMessage: 'Does not contain' },
+  before: { id: 'label.before', defaultMessage: 'Before' },
+  after: { id: 'label.after', defaultMessage: 'After' },
+  total: { id: 'label.total', defaultMessage: 'Total' },
+  sum: { id: 'label.sum', defaultMessage: 'Sum' },
+  average: { id: 'label.average', defaultMessage: 'Average' },
+  min: { id: 'label.min', defaultMessage: 'Min' },
+  max: { id: 'label.max', defaultMessage: 'Max' },
+  unique: { id: 'label.unique', defaultMessage: 'Unique' },
+  value: { id: 'label.value', defaultMessage: 'Value' },
+  overview: { id: 'label.overview', defaultMessage: 'Overview' },
+  totalRecords: { id: 'label.total-records', defaultMessage: 'Total records' },
   insights: { id: 'label.insights', defaultMessage: 'Insights' },
+  retention: { id: 'label.retention', defaultMessage: 'Retention' },
   dropoff: { id: 'label.dropoff', defaultMessage: 'Dropoff' },
+  referrer: { id: 'label.referrer', defaultMessage: 'Referrer' },
+  country: { id: 'label.country', defaultMessage: 'Country' },
+  region: { id: 'label.region', defaultMessage: 'Region' },
+  city: { id: 'label.city', defaultMessage: 'City' },
+  browser: { id: 'label.browser', defaultMessage: 'Browser' },
+  device: { id: 'label.device', defaultMessage: 'Device' },
+  pageTitle: { id: 'label.pageTitle', defaultMessage: 'Page title' },
+  day: { id: 'label.day', defaultMessage: 'Day' },
+  date: { id: 'label.date', defaultMessage: 'Date' },
+  pageOf: { id: 'label.page-of', defaultMessage: 'Page {current} of {total}' },
 });
 
 export const messages = defineMessages({
@@ -230,7 +246,7 @@ export const messages = defineMessages({
   },
   noResultsFound: {
     id: 'message.no-results-found',
-    defaultMessage: 'No results were found.',
+    defaultMessage: 'No results found.',
   },
   noWebsitesConfigured: {
     id: 'message.no-websites-configured',
diff --git a/components/metrics/BrowsersTable.js b/components/metrics/BrowsersTable.js
index 2920280f66..bf4d0aaab4 100644
--- a/components/metrics/BrowsersTable.js
+++ b/components/metrics/BrowsersTable.js
@@ -1,16 +1,17 @@
+import { useRouter } from 'next/router';
 import FilterLink from 'components/common/FilterLink';
 import MetricsTable from 'components/metrics/MetricsTable';
-import { BROWSERS } from 'lib/constants';
 import useMessages from 'hooks/useMessages';
-import { useRouter } from 'next/router';
+import useFormat from 'hooks/useFormat';
 
 export function BrowsersTable({ websiteId, ...props }) {
   const { formatMessage, labels } = useMessages();
   const { basePath } = useRouter();
+  const { formatBrowser } = useFormat();
 
   function renderLink({ x: browser }) {
     return (
-      <FilterLink id="browser" value={browser} label={BROWSERS[browser] || browser}>
+      <FilterLink id="browser" value={browser} label={formatBrowser(browser)}>
         <img
           src={`${basePath}/images/browsers/${browser || 'unknown'}.png`}
           alt={browser}
diff --git a/components/metrics/CountriesTable.js b/components/metrics/CountriesTable.js
index c72d96ed2e..283fdaf29e 100644
--- a/components/metrics/CountriesTable.js
+++ b/components/metrics/CountriesTable.js
@@ -1,8 +1,7 @@
 import { useRouter } from 'next/router';
 import FilterLink from 'components/common/FilterLink';
 import useCountryNames from 'hooks/useCountryNames';
-import useLocale from 'hooks/useLocale';
-import useMessages from 'hooks/useMessages';
+import { useLocale, useMessages, useFormat } from 'hooks';
 import MetricsTable from './MetricsTable';
 
 export function CountriesTable({ websiteId, ...props }) {
@@ -10,6 +9,7 @@ export function CountriesTable({ websiteId, ...props }) {
   const countryNames = useCountryNames(locale);
   const { formatMessage, labels } = useMessages();
   const { basePath } = useRouter();
+  const { formatCountry } = useFormat();
 
   function renderLink({ x: code }) {
     return (
@@ -17,7 +17,7 @@ export function CountriesTable({ websiteId, ...props }) {
         id="country"
         className={locale}
         value={countryNames[code] && code}
-        label={countryNames[code]}
+        label={formatCountry(code)}
       >
         <img src={`${basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`} alt={code} />
       </FilterLink>
diff --git a/components/metrics/DevicesTable.js b/components/metrics/DevicesTable.js
index 0b8d57086d..98690d0a79 100644
--- a/components/metrics/DevicesTable.js
+++ b/components/metrics/DevicesTable.js
@@ -2,18 +2,16 @@ import MetricsTable from './MetricsTable';
 import FilterLink from 'components/common/FilterLink';
 import useMessages from 'hooks/useMessages';
 import { useRouter } from 'next/router';
+import { useFormat } from 'hooks';
 
 export function DevicesTable({ websiteId, ...props }) {
   const { formatMessage, labels } = useMessages();
   const { basePath } = useRouter();
+  const { formatDevice } = useFormat();
 
   function renderLink({ x: device }) {
     return (
-      <FilterLink
-        id="device"
-        value={labels[device] && device}
-        label={formatMessage(labels[device] || labels.unknown)}
-      >
+      <FilterLink id="device" value={labels[device] && device} label={formatDevice(device)}>
         <img
           src={`${basePath}/images/device/${device?.toLowerCase() || 'unknown'}.png`}
           alt={device}
diff --git a/components/pages/console/TestConsole.js b/components/pages/console/TestConsole.js
index 4f167b9a72..060314fd26 100644
--- a/components/pages/console/TestConsole.js
+++ b/components/pages/console/TestConsole.js
@@ -72,7 +72,7 @@ export function TestConsole() {
   }
 
   const [websiteId] = id || [];
-  const website = data.find(({ id }) => websiteId === id);
+  const website = data?.data.find(({ id }) => websiteId === id);
 
   return (
     <Page loading={isLoading} error={error}>
diff --git a/components/pages/dashboard/Dashboard.js b/components/pages/dashboard/Dashboard.js
index 2d9756dbaa..601e741b05 100644
--- a/components/pages/dashboard/Dashboard.js
+++ b/components/pages/dashboard/Dashboard.js
@@ -12,16 +12,17 @@ import useDashboard from 'store/dashboard';
 import useMessages from 'hooks/useMessages';
 import useLocale from 'hooks/useLocale';
 
-export function Dashboard({ userId }) {
+export function Dashboard() {
   const { formatMessage, labels, messages } = useMessages();
   const dashboard = useDashboard();
   const { showCharts, limit, editing } = dashboard;
   const [max, setMax] = useState(limit);
   const { get, useQuery } = useApi();
   const { data, isLoading, error } = useQuery(['websites'], () =>
-    get('/websites', { userId, includeTeams: 1 }),
+    get('/websites', { includeTeams: 1 }),
   );
-  const hasData = data && data.length !== 0;
+  const hasData = data && data?.data.length !== 0;
+
   const { dir } = useLocale();
 
   function handleMore() {
@@ -47,8 +48,10 @@ export function Dashboard({ userId }) {
       )}
       {hasData && (
         <>
-          {editing && <DashboardEdit websites={data} />}
-          {!editing && <WebsiteChartList websites={data} showCharts={showCharts} limit={max} />}
+          {editing && <DashboardEdit websites={data?.data} />}
+          {!editing && (
+            <WebsiteChartList websites={data?.data} showCharts={showCharts} limit={max} />
+          )}
           {max < data.length && (
             <Flexbox justifyContent="center">
               <Button onClick={handleMore}>
diff --git a/components/pages/event-data/EventDataMetricsBar.js b/components/pages/event-data/EventDataMetricsBar.js
index 48843287c0..90f065d5f1 100644
--- a/components/pages/event-data/EventDataMetricsBar.js
+++ b/components/pages/event-data/EventDataMetricsBar.js
@@ -28,6 +28,11 @@ export function EventDataMetricsBar({ websiteId }) {
         <MetricsBar isLoading={isLoading} isFetched={isFetched} error={error}>
           {!error && isFetched && (
             <>
+              <MetricCard
+                className={styles.card}
+                label={formatMessage(labels.events)}
+                value={data?.events}
+              />
               <MetricCard
                 className={styles.card}
                 label={formatMessage(labels.fields)}
diff --git a/components/pages/event-data/EventDataTable.js b/components/pages/event-data/EventDataTable.js
index 8260ac35b5..b0d11b9d4a 100644
--- a/components/pages/event-data/EventDataTable.js
+++ b/components/pages/event-data/EventDataTable.js
@@ -2,6 +2,7 @@ import Link from 'next/link';
 import { GridTable, GridColumn } from 'react-basics';
 import { useMessages, usePageQuery } from 'hooks';
 import Empty from 'components/common/Empty';
+import { DATA_TYPES } from 'lib/constants';
 
 export function EventDataTable({ data = [] }) {
   const { formatMessage, labels } = useMessages();
@@ -13,15 +14,18 @@ export function EventDataTable({ data = [] }) {
 
   return (
     <GridTable data={data}>
-      <GridColumn name="event" label={formatMessage(labels.event)}>
+      <GridColumn name="eventName" label={formatMessage(labels.event)}>
         {row => (
-          <Link href={resolveUrl({ event: row.event })} shallow={true}>
-            {row.event}
+          <Link href={resolveUrl({ event: row.eventName })} shallow={true}>
+            {row.eventName}
           </Link>
         )}
       </GridColumn>
-      <GridColumn name="field" label={formatMessage(labels.field)}>
-        {row => row.field}
+      <GridColumn name="fieldName" label={formatMessage(labels.field)}>
+        {row => row.fieldName}
+      </GridColumn>
+      <GridColumn name="dataType" label={formatMessage(labels.type)}>
+        {row => DATA_TYPES[row.dataType]}
       </GridColumn>
       <GridColumn name="total" label={formatMessage(labels.totalRecords)}>
         {({ total }) => total.toLocaleString()}
diff --git a/components/pages/event-data/EventDataValueTable.js b/components/pages/event-data/EventDataValueTable.js
index 2637053ef7..69ed10a7a1 100644
--- a/components/pages/event-data/EventDataValueTable.js
+++ b/components/pages/event-data/EventDataValueTable.js
@@ -1,9 +1,10 @@
-import { GridTable, GridColumn, Button, Icon, Text, Flexbox } from 'react-basics';
+import { GridTable, GridColumn, Button, Icon, Text } from 'react-basics';
 import { useMessages, usePageQuery } from 'hooks';
 import Link from 'next/link';
 import Icons from 'components/icons';
 import PageHeader from 'components/layout/PageHeader';
 import Empty from 'components/common/Empty';
+import { DATA_TYPES } from 'lib/constants';
 
 export function EventDataValueTable({ data = [], event }) {
   const { formatMessage, labels } = useMessages();
@@ -31,8 +32,11 @@ export function EventDataValueTable({ data = [], event }) {
       {data.length <= 0 && <Empty />}
       {data.length > 0 && (
         <GridTable data={data}>
-          <GridColumn name="field" label={formatMessage(labels.field)} />
-          <GridColumn name="value" label={formatMessage(labels.value)} />
+          <GridColumn name="fieldName" label={formatMessage(labels.field)} />
+          <GridColumn name="dataType" label={formatMessage(labels.type)}>
+            {row => DATA_TYPES[row.dataType]}
+          </GridColumn>
+          <GridColumn name="fieldValue" label={formatMessage(labels.value)} />
           <GridColumn name="total" label={formatMessage(labels.totalRecords)} width="200px">
             {({ total }) => total.toLocaleString()}
           </GridColumn>
diff --git a/components/pages/realtime/RealtimeLog.js b/components/pages/realtime/RealtimeLog.js
index 744bff00b3..6486f707fb 100644
--- a/components/pages/realtime/RealtimeLog.js
+++ b/components/pages/realtime/RealtimeLog.js
@@ -8,7 +8,7 @@ import useLocale from 'hooks/useLocale';
 import useCountryNames from 'hooks/useCountryNames';
 import { BROWSERS } from 'lib/constants';
 import { stringToColor } from 'lib/format';
-import { dateFormat } from 'lib/date';
+import { formatDate } from 'lib/date';
 import { safeDecodeURI } from 'next-basics';
 import Icons from 'components/icons';
 import styles from './RealtimeLog.module.css';
@@ -50,7 +50,7 @@ export function RealtimeLog({ data, websiteDomain }) {
     },
   ];
 
-  const getTime = ({ createdAt }) => dateFormat(new Date(createdAt), 'pp', locale);
+  const getTime = ({ createdAt }) => formatDate(new Date(createdAt), 'pp', locale);
 
   const getColor = ({ id, sessionId }) => stringToColor(sessionId || id);
 
diff --git a/components/pages/reports/BaseParameters.js b/components/pages/reports/BaseParameters.js
index 394432cfa8..76c35a581a 100644
--- a/components/pages/reports/BaseParameters.js
+++ b/components/pages/reports/BaseParameters.js
@@ -6,7 +6,12 @@ import { useContext } from 'react';
 import { ReportContext } from './Report';
 import { useMessages } from 'hooks';
 
-export function BaseParameters() {
+export function BaseParameters({
+  showWebsiteSelect = true,
+  allowWebsiteSelect = true,
+  showDateSelect = true,
+  allowDateSelect = true,
+}) {
   const { report, updateReport } = useContext(ReportContext);
   const { formatMessage, labels } = useMessages();
 
@@ -24,17 +29,25 @@ export function BaseParameters() {
 
   return (
     <>
-      <FormRow label={formatMessage(labels.website)}>
-        <WebsiteSelect websiteId={websiteId} onSelect={handleWebsiteSelect} />
-      </FormRow>
-      <FormRow label={formatMessage(labels.dateRange)}>
-        <DateFilter
-          value={value}
-          startDate={startDate}
-          endDate={endDate}
-          onChange={handleDateChange}
-        />
-      </FormRow>
+      {showWebsiteSelect && (
+        <FormRow label={formatMessage(labels.website)}>
+          {allowWebsiteSelect && (
+            <WebsiteSelect websiteId={websiteId} onSelect={handleWebsiteSelect} />
+          )}
+        </FormRow>
+      )}
+      {showDateSelect && (
+        <FormRow label={formatMessage(labels.dateRange)}>
+          {allowDateSelect && (
+            <DateFilter
+              value={value}
+              startDate={startDate}
+              endDate={endDate}
+              onChange={handleDateChange}
+            />
+          )}
+        </FormRow>
+      )}
     </>
   );
 }
diff --git a/components/pages/reports/FieldFilterForm.js b/components/pages/reports/FieldFilterForm.js
index 021ea97ef8..3df8f74569 100644
--- a/components/pages/reports/FieldFilterForm.js
+++ b/components/pages/reports/FieldFilterForm.js
@@ -1,55 +1,58 @@
 import { useState } from 'react';
-import { Form, FormRow, Menu, Item, Flexbox, Dropdown, TextField, Button } from 'react-basics';
-import { useFilters } from 'hooks';
+import { Form, FormRow, Item, Flexbox, Dropdown, Button } from 'react-basics';
+import { useMessages, useFilters, useFormat } from 'hooks';
 import styles from './FieldFilterForm.module.css';
 
-export default function FieldFilterForm({ name, type, onSelect }) {
-  const [filter, setFilter] = useState('');
-  const [value, setValue] = useState('');
-  const { filters, types } = useFilters();
-  const items = types[type];
+export default function FieldFilterForm({ name, label, type, values, onSelect }) {
+  const { formatMessage, labels } = useMessages();
+  const [filter, setFilter] = useState('eq');
+  const [value, setValue] = useState();
+  const { getFilters } = useFilters();
+  const { formatValue } = useFormat();
+  const filters = getFilters(type);
+
+  const renderFilterValue = value => {
+    return filters.find(f => f.value === value)?.label;
+  };
 
   const renderValue = value => {
-    return filters[value];
+    return formatValue(value, name);
   };
 
-  if (type === 'boolean') {
-    return (
-      <Form>
-        <FormRow label={name}>
-          <Menu onSelect={value => onSelect({ name, type, value: ['eq', value] })}>
-            {items.map(value => {
-              return <Item key={value}>{filters[value]}</Item>;
-            })}
-          </Menu>
-        </FormRow>
-      </Form>
-    );
-  }
+  const handleAdd = () => {
+    onSelect({ name, type, filter, value });
+  };
 
   return (
     <Form>
-      <FormRow label={name} className={styles.filter}>
+      <FormRow label={label} className={styles.filter}>
         <Flexbox gap={10}>
           <Dropdown
             className={styles.dropdown}
-            items={items}
+            items={filters}
             value={filter}
-            renderValue={renderValue}
+            renderValue={renderFilterValue}
             onChange={setFilter}
+          >
+            {({ value, label }) => {
+              return <Item key={value}>{label}</Item>;
+            }}
+          </Dropdown>
+          <Dropdown
+            className={styles.dropdown}
+            menuProps={{ className: styles.menu }}
+            items={values}
+            value={value}
+            renderValue={renderValue}
+            onChange={setValue}
           >
             {value => {
-              return <Item key={value}>{filters[value]}</Item>;
+              return <Item key={value}>{formatValue(value, name)}</Item>;
             }}
           </Dropdown>
-          <TextField value={value} onChange={e => setValue(e.target.value)} autoFocus={true} />
         </Flexbox>
-        <Button
-          variant="primary"
-          onClick={() => onSelect({ name, type, value: [filter, value] })}
-          disabled={!filter || !value}
-        >
-          Add
+        <Button variant="primary" onClick={handleAdd} disabled={!filter || !value}>
+          {formatMessage(labels.add)}
         </Button>
       </FormRow>
     </Form>
diff --git a/components/pages/reports/FieldFilterForm.module.css b/components/pages/reports/FieldFilterForm.module.css
index 15baa582c2..bbb338afc5 100644
--- a/components/pages/reports/FieldFilterForm.module.css
+++ b/components/pages/reports/FieldFilterForm.module.css
@@ -15,3 +15,8 @@
 .dropdown {
   min-width: 180px;
 }
+
+.menu {
+  min-width: 360px;
+  max-height: 300px;
+}
diff --git a/components/pages/reports/FieldSelectForm.js b/components/pages/reports/FieldSelectForm.js
index 0e41ea1fbc..434a5ae758 100644
--- a/components/pages/reports/FieldSelectForm.js
+++ b/components/pages/reports/FieldSelectForm.js
@@ -2,18 +2,18 @@ import { Menu, Item, Form, FormRow } from 'react-basics';
 import { useMessages } from 'hooks';
 import styles from './FieldSelectForm.module.css';
 
-export default function FieldSelectForm({ fields, onSelect }) {
+export default function FieldSelectForm({ items, onSelect, showType = true }) {
   const { formatMessage, labels } = useMessages();
 
   return (
     <Form>
       <FormRow label={formatMessage(labels.fields)}>
-        <Menu className={styles.menu} onSelect={key => onSelect(fields[key])}>
-          {fields.map(({ label, name, type }, index) => {
+        <Menu className={styles.menu} onSelect={key => onSelect(items[key])}>
+          {items.map(({ name, label, type }, index) => {
             return (
               <Item key={index} className={styles.item}>
                 <div>{label || name}</div>
-                <div className={styles.type}>{type}</div>
+                {showType && type && <div className={styles.type}>{type}</div>}
               </Item>
             );
           })}
diff --git a/components/pages/reports/FilterSelectForm.js b/components/pages/reports/FilterSelectForm.js
new file mode 100644
index 0000000000..38094bcadc
--- /dev/null
+++ b/components/pages/reports/FilterSelectForm.js
@@ -0,0 +1,42 @@
+import { useState } from 'react';
+import FieldSelectForm from './FieldSelectForm';
+import FieldFilterForm from './FieldFilterForm';
+import { useApi } from 'hooks';
+import { Loading } from 'react-basics';
+
+function useValues(websiteId, type) {
+  const { get, useQuery } = useApi();
+  const { data, error, isLoading } = useQuery(
+    ['websites:values', websiteId, type],
+    () =>
+      get(`/websites/${websiteId}/values`, {
+        type,
+      }),
+    { enabled: !!(websiteId && type) },
+  );
+
+  return { data, error, isLoading };
+}
+
+export default function FilterSelectForm({ websiteId, items, onSelect }) {
+  const [field, setField] = useState();
+  const { data, isLoading } = useValues(websiteId, field?.name);
+
+  if (!field) {
+    return <FieldSelectForm items={items} onSelect={setField} showType={false} />;
+  }
+
+  if (isLoading) {
+    return <Loading position="center" icon="dots" />;
+  }
+
+  return (
+    <FieldFilterForm
+      name={field?.name}
+      label={field?.label}
+      type={field?.type}
+      values={data}
+      onSelect={onSelect}
+    />
+  );
+}
diff --git a/components/pages/reports/PopupForm.js b/components/pages/reports/PopupForm.js
index 0f0ead369f..6b99b00a9e 100644
--- a/components/pages/reports/PopupForm.js
+++ b/components/pages/reports/PopupForm.js
@@ -1,29 +1,15 @@
-import { createPortal } from 'react-dom';
-import { useDocumentClick, useKeyDown } from 'react-basics';
 import classNames from 'classnames';
 import styles from './PopupForm.module.css';
 
-export function PopupForm({ element, className, children, onClose }) {
-  const { right, top } = element.getBoundingClientRect();
-  const style = { position: 'absolute', left: right, top };
-
-  useKeyDown('Escape', onClose);
-
-  useDocumentClick(e => {
-    if (e.target !== element && !element?.parentElement?.contains(e.target)) {
-      onClose();
-    }
-  });
-
-  const handleClick = e => {
-    e.stopPropagation();
-  };
-
-  return createPortal(
-    <div className={classNames(styles.form, className)} style={style} onClick={handleClick}>
+export function PopupForm({ className, style, children }) {
+  return (
+    <div
+      className={classNames(styles.form, className)}
+      style={style}
+      onClick={e => e.stopPropagation()}
+    >
       {children}
-    </div>,
-    document.body,
+    </div>
   );
 }
 
diff --git a/components/pages/reports/PopupForm.module.css b/components/pages/reports/PopupForm.module.css
index 4daf199ac1..94d98b38cc 100644
--- a/components/pages/reports/PopupForm.module.css
+++ b/components/pages/reports/PopupForm.module.css
@@ -3,8 +3,8 @@
   background: var(--base50);
   min-width: 300px;
   padding: 20px;
-  margin-left: 30px;
   border: 1px solid var(--base400);
   border-radius: var(--border-radius);
   box-shadow: 0 0 0 5px rgba(0, 0, 0, 0.1);
+  z-index: 1000;
 }
diff --git a/components/pages/reports/Report.js b/components/pages/reports/Report.js
index 0a98ef7561..685ebb9fe1 100644
--- a/components/pages/reports/Report.js
+++ b/components/pages/reports/Report.js
@@ -8,6 +8,8 @@ export const ReportContext = createContext(null);
 export function Report({ reportId, defaultParameters, children, ...props }) {
   const report = useReport(reportId, defaultParameters);
 
+  //console.log({ report });
+
   return (
     <ReportContext.Provider value={{ ...report }}>
       <Page {...props} className={styles.container}>
diff --git a/components/pages/reports/ReportDetails.js b/components/pages/reports/ReportDetails.js
index c41d12f6a5..df1589af78 100644
--- a/components/pages/reports/ReportDetails.js
+++ b/components/pages/reports/ReportDetails.js
@@ -1,9 +1,13 @@
 import FunnelReport from './funnel/FunnelReport';
 import EventDataReport from './event-data/EventDataReport';
+import InsightsReport from './insights/InsightsReport';
+import RetentionReport from './retention/RetentionReport';
 
 const reports = {
   funnel: FunnelReport,
   'event-data': EventDataReport,
+  insights: InsightsReport,
+  retention: RetentionReport,
 };
 
 export default function ReportDetails({ reportId, reportType }) {
diff --git a/components/pages/reports/ReportTemplates.js b/components/pages/reports/ReportTemplates.js
index 60ae11e797..0f5e710d5d 100644
--- a/components/pages/reports/ReportTemplates.js
+++ b/components/pages/reports/ReportTemplates.js
@@ -4,6 +4,7 @@ import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
 import Funnel from 'assets/funnel.svg';
 import Lightbulb from 'assets/lightbulb.svg';
+import Magnet from 'assets/magnet.svg';
 import styles from './ReportTemplates.module.css';
 import { useMessages } from 'hooks';
 
@@ -33,20 +34,24 @@ export function ReportTemplates() {
   const { formatMessage, labels } = useMessages();
 
   const reports = [
-    /*
     {
       title: formatMessage(labels.insights),
       description: 'Dive deeper into your data by using segments and filters.',
       url: '/reports/insights',
       icon: <Lightbulb />,
     },
-     */
     {
       title: formatMessage(labels.funnel),
       description: 'Understand the conversion and drop-off rate of users.',
       url: '/reports/funnel',
       icon: <Funnel />,
     },
+    {
+      title: formatMessage(labels.retention),
+      description: 'Measure you website stickiness by tracking how often users return.',
+      url: '/reports/retention',
+      icon: <Magnet />,
+    },
   ];
 
   return (
diff --git a/components/pages/reports/ReportTemplates.module.css b/components/pages/reports/ReportTemplates.module.css
index 331835051b..0cdcb8351e 100644
--- a/components/pages/reports/ReportTemplates.module.css
+++ b/components/pages/reports/ReportTemplates.module.css
@@ -2,7 +2,6 @@
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(360px, 1fr));
   gap: 20px;
-  width: 360px;
 }
 
 .report {
diff --git a/components/pages/reports/ReportsPage.js b/components/pages/reports/ReportsPage.js
index 470e1b08d1..95959832e6 100644
--- a/components/pages/reports/ReportsPage.js
+++ b/components/pages/reports/ReportsPage.js
@@ -1,13 +1,25 @@
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
 import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
+import { useMessages, useReports } from 'hooks';
 import Link from 'next/link';
 import { Button, Icon, Icons, Text } from 'react-basics';
-import { useMessages, useReports } from 'hooks';
 import ReportsTable from './ReportsTable';
 
 export function ReportsPage() {
-  const { formatMessage, labels } = useMessages();
-  const { reports, error, isLoading } = useReports();
+  const { formatMessage, labels, messages } = useMessages();
+  const {
+    reports,
+    error,
+    isLoading,
+    deleteReport,
+    filter,
+    handleFilterChange,
+    handlePageChange,
+    handlePageSizeChange,
+  } = useReports();
+
+  const hasData = (reports && reports?.data.length !== 0) || filter;
 
   return (
     <Page loading={isLoading} error={error}>
@@ -21,7 +33,23 @@ export function ReportsPage() {
           </Button>
         </Link>
       </PageHeader>
-      <ReportsTable data={reports} />
+
+      {hasData && (
+        <ReportsTable
+          data={reports}
+          showSearch={true}
+          showPaging={true}
+          onFilterChange={handleFilterChange}
+          onPageChange={handlePageChange}
+          onPageSizeChange={handlePageSizeChange}
+          onDelete={deleteReport}
+          filterValue={filter}
+          showDomain={true}
+        />
+      )}
+      {!hasData && (
+        <EmptyPlaceholder message={formatMessage(messages.noDataAvailable)}></EmptyPlaceholder>
+      )}
     </Page>
   );
 }
diff --git a/components/pages/reports/ReportsTable.js b/components/pages/reports/ReportsTable.js
index 244740e1ce..98f5267a49 100644
--- a/components/pages/reports/ReportsTable.js
+++ b/components/pages/reports/ReportsTable.js
@@ -1,18 +1,36 @@
-import { useState } from 'react';
-import { Flexbox, Icon, Icons, Text, Button, Modal } from 'react-basics';
+import ConfirmDeleteForm from 'components/common/ConfirmDeleteForm';
 import LinkButton from 'components/common/LinkButton';
 import SettingsTable from 'components/common/SettingsTable';
-import ConfirmDeleteForm from 'components/common/ConfirmDeleteForm';
 import { useMessages } from 'hooks';
+import useUser from 'hooks/useUser';
+import { useState } from 'react';
+import { Button, Flexbox, Icon, Icons, Modal, Text } from 'react-basics';
 
-export function ReportsTable({ data = [], onDelete = () => {} }) {
+export function ReportsTable({
+  data = [],
+  onDelete = () => {},
+  filterValue,
+  onFilterChange,
+  onPageChange,
+  onPageSizeChange,
+  showDomain,
+}) {
   const [report, setReport] = useState(null);
   const { formatMessage, labels } = useMessages();
+  const { user } = useUser();
+
+  const domainColumn = [
+    {
+      name: 'domain',
+      label: formatMessage(labels.domain),
+    },
+  ];
 
   const columns = [
     { name: 'name', label: formatMessage(labels.name) },
     { name: 'description', label: formatMessage(labels.description) },
     { name: 'type', label: formatMessage(labels.type) },
+    ...(showDomain ? domainColumn : []),
     { name: 'action', label: ' ' },
   ];
 
@@ -22,13 +40,26 @@ export function ReportsTable({ data = [], onDelete = () => {} }) {
 
   return (
     <>
-      <SettingsTable columns={columns} data={data}>
+      <SettingsTable
+        columns={columns}
+        data={data}
+        showSearch={true}
+        showPaging={true}
+        onFilterChange={onFilterChange}
+        onPageChange={onPageChange}
+        onPageSizeChange={onPageSizeChange}
+        filterValue={filterValue}
+      >
         {row => {
-          const { id } = row;
+          const { id, userId: reportOwnerId, website } = row;
+          if (showDomain) {
+            row.domain = website.domain;
+          }
 
           return (
             <Flexbox gap={10}>
               <LinkButton href={`/reports/${id}`}>{formatMessage(labels.view)}</LinkButton>
+              {!showDomain || user.id === reportOwnerId || user.id === website?.userId}
               <Button onClick={() => setReport(row)}>
                 <Icon>
                   <Icons.Trash />
diff --git a/components/pages/reports/funnel/FunnelChart.js b/components/pages/reports/funnel/FunnelChart.js
index 7253c3fa56..c35afe4e62 100644
--- a/components/pages/reports/funnel/FunnelChart.js
+++ b/components/pages/reports/funnel/FunnelChart.js
@@ -1,5 +1,5 @@
 import { useCallback, useContext, useMemo } from 'react';
-import { Loading } from 'react-basics';
+import { Loading, StatusLight } from 'react-basics';
 import useMessages from 'hooks/useMessages';
 import useTheme from 'hooks/useTheme';
 import BarChart from 'components/metrics/BarChart';
@@ -22,14 +22,25 @@ export function FunnelChart({ className, loading }) {
   );
 
   const renderTooltipPopup = useCallback((setTooltipPopup, model) => {
-    const { opacity, dataPoints } = model.tooltip;
+    const { opacity, labelColors, dataPoints } = model.tooltip;
 
     if (!dataPoints?.length || !opacity) {
       setTooltipPopup(null);
       return;
     }
 
-    setTooltipPopup(`${formatLongNumber(dataPoints[0].raw.y)} ${formatMessage(labels.visitors)}`);
+    setTooltipPopup(
+      <>
+        <div>
+          {formatLongNumber(dataPoints[0].raw.y)} {formatMessage(labels.visitors)}
+        </div>
+        <div>
+          <StatusLight color={labelColors?.[0]?.backgroundColor}>
+            {formatLongNumber(dataPoints[0].raw.z)}% {formatMessage(labels.dropoff)}
+          </StatusLight>
+        </div>
+      </>,
+    );
   }, []);
 
   const datasets = useMemo(() => {
diff --git a/components/pages/reports/funnel/FunnelParameters.js b/components/pages/reports/funnel/FunnelParameters.js
index ae4981761f..03898db3e4 100644
--- a/components/pages/reports/funnel/FunnelParameters.js
+++ b/components/pages/reports/funnel/FunnelParameters.js
@@ -16,6 +16,7 @@ import UrlAddForm from './UrlAddForm';
 import { ReportContext } from 'components/pages/reports/Report';
 import BaseParameters from '../BaseParameters';
 import ParameterList from '../ParameterList';
+import PopupForm from '../PopupForm';
 
 export function FunnelParameters() {
   const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
@@ -53,7 +54,11 @@ export function FunnelParameters() {
         </Icon>
         <Popup position="bottom" alignment="start">
           {(close, element) => {
-            return <UrlAddForm element={element} onAdd={handleAddUrl} onClose={close} />;
+            return (
+              <PopupForm element={element} onClose={close}>
+                <UrlAddForm onAdd={handleAddUrl} />
+              </PopupForm>
+            );
           }}
         </Popup>
       </PopupTrigger>
diff --git a/components/pages/reports/funnel/FunnelReport.js b/components/pages/reports/funnel/FunnelReport.js
index 7b4d8ecede..d2971fa301 100644
--- a/components/pages/reports/funnel/FunnelReport.js
+++ b/components/pages/reports/funnel/FunnelReport.js
@@ -6,9 +6,10 @@ import ReportHeader from '../ReportHeader';
 import ReportMenu from '../ReportMenu';
 import ReportBody from '../ReportBody';
 import Funnel from 'assets/funnel.svg';
+import { REPORT_TYPES } from 'lib/constants';
 
 const defaultParameters = {
-  type: 'funnel',
+  type: REPORT_TYPES.funnel,
   parameters: { window: 60, urls: [] },
 };
 
diff --git a/components/pages/reports/funnel/UrlAddForm.js b/components/pages/reports/funnel/UrlAddForm.js
index 0fb78b3d29..ce20211627 100644
--- a/components/pages/reports/funnel/UrlAddForm.js
+++ b/components/pages/reports/funnel/UrlAddForm.js
@@ -2,16 +2,14 @@ import { useState } from 'react';
 import { useMessages } from 'hooks';
 import { Button, Form, FormRow, TextField, Flexbox } from 'react-basics';
 import styles from './UrlAddForm.module.css';
-import PopupForm from '../PopupForm';
 
-export function UrlAddForm({ defaultValue = '', element, onAdd, onClose }) {
+export function UrlAddForm({ defaultValue = '', onAdd }) {
   const [url, setUrl] = useState(defaultValue);
   const { formatMessage, labels } = useMessages();
 
   const handleSave = () => {
     onAdd(url);
     setUrl('');
-    onClose();
   };
 
   const handleChange = e => {
@@ -26,25 +24,23 @@ export function UrlAddForm({ defaultValue = '', element, onAdd, onClose }) {
   };
 
   return (
-    <PopupForm element={element}>
-      <Form>
-        <FormRow label={formatMessage(labels.url)}>
-          <Flexbox gap={10}>
-            <TextField
-              className={styles.input}
-              value={url}
-              onChange={handleChange}
-              autoFocus={true}
-              autoComplete="off"
-              onKeyDown={handleKeyDown}
-            />
-            <Button variant="primary" onClick={handleSave}>
-              {formatMessage(labels.add)}
-            </Button>
-          </Flexbox>
-        </FormRow>
-      </Form>
-    </PopupForm>
+    <Form>
+      <FormRow label={formatMessage(labels.url)}>
+        <Flexbox gap={10}>
+          <TextField
+            className={styles.input}
+            value={url}
+            onChange={handleChange}
+            autoFocus={true}
+            autoComplete="off"
+            onKeyDown={handleKeyDown}
+          />
+          <Button variant="primary" onClick={handleSave}>
+            {formatMessage(labels.add)}
+          </Button>
+        </Flexbox>
+      </FormRow>
+    </Form>
   );
 }
 
diff --git a/components/pages/reports/insights/InsightsParameters.js b/components/pages/reports/insights/InsightsParameters.js
index b87a566dac..9f3571e6db 100644
--- a/components/pages/reports/insights/InsightsParameters.js
+++ b/components/pages/reports/insights/InsightsParameters.js
@@ -1,69 +1,104 @@
 import { useContext, useRef } from 'react';
-import { useMessages } from 'hooks';
-import { Form, FormRow, FormButtons, SubmitButton, PopupTrigger, Icon, Popup } from 'react-basics';
+import { useFormat, useMessages, useFilters } from 'hooks';
+import {
+  Form,
+  FormRow,
+  FormButtons,
+  SubmitButton,
+  PopupTrigger,
+  Icon,
+  Popup,
+  TooltipPopup,
+} from 'react-basics';
 import { ReportContext } from 'components/pages/reports/Report';
-import { REPORT_PARAMETERS, WEBSITE_EVENT_FIELDS } from 'lib/constants';
 import Icons from 'components/icons';
 import BaseParameters from '../BaseParameters';
-import FieldAddForm from '../FieldAddForm';
 import ParameterList from '../ParameterList';
 import styles from './InsightsParameters.module.css';
+import PopupForm from '../PopupForm';
+import FilterSelectForm from '../FilterSelectForm';
+import FieldSelectForm from '../FieldSelectForm';
 
 export function InsightsParameters() {
   const { report, runReport, updateReport, isRunning } = useContext(ReportContext);
   const { formatMessage, labels } = useMessages();
+  const { formatValue } = useFormat();
+  const { filterLabels } = useFilters();
   const ref = useRef(null);
   const { parameters } = report || {};
-  const { websiteId, dateRange, fields, filters, groups } = parameters || {};
-  const queryEnabled = websiteId && dateRange && fields?.length;
-  const fieldOptions = Object.keys(WEBSITE_EVENT_FIELDS).map(key => WEBSITE_EVENT_FIELDS[key]);
+  const { websiteId, dateRange, fields, filters } = parameters || {};
+  const { startDate, endDate } = dateRange || {};
+  const parametersSelected = websiteId && startDate && endDate;
+  const queryEnabled = websiteId && dateRange && (fields?.length || filters?.length);
+
+  const fieldOptions = [
+    { name: 'url', type: 'string', label: formatMessage(labels.url) },
+    { name: 'title', type: 'string', label: formatMessage(labels.pageTitle) },
+    { name: 'referrer', type: 'string', label: formatMessage(labels.referrer) },
+    { name: 'query', type: 'string', label: formatMessage(labels.query) },
+    { name: 'browser', type: 'string', label: formatMessage(labels.browser) },
+    { name: 'os', type: 'string', label: formatMessage(labels.os) },
+    { name: 'device', type: 'string', label: formatMessage(labels.device) },
+    { name: 'country', type: 'string', label: formatMessage(labels.country) },
+    { name: 'region', type: 'string', label: formatMessage(labels.region) },
+    { name: 'city', type: 'string', label: formatMessage(labels.city) },
+  ];
 
   const parameterGroups = [
-    { label: formatMessage(labels.fields), group: REPORT_PARAMETERS.fields },
-    { label: formatMessage(labels.filters), group: REPORT_PARAMETERS.filters },
-    { label: formatMessage(labels.breakdown), group: REPORT_PARAMETERS.groups },
+    { id: 'fields', label: formatMessage(labels.fields) },
+    { id: 'filters', label: formatMessage(labels.filters) },
   ];
 
   const parameterData = {
     fields,
     filters,
-    groups,
   };
 
   const handleSubmit = values => {
     runReport(values);
   };
 
-  const handleAdd = (group, value) => {
-    const data = parameterData[group];
+  const handleAdd = (id, value) => {
+    const data = parameterData[id];
 
     if (!data.find(({ name }) => name === value.name)) {
-      updateReport({ parameters: { [group]: data.concat(value) } });
+      updateReport({ parameters: { [id]: data.concat(value) } });
     }
   };
 
-  const handleRemove = (group, index) => {
-    const data = [...parameterData[group]];
+  const handleRemove = (id, index) => {
+    const data = [...parameterData[id]];
     data.splice(index, 1);
-    updateReport({ parameters: { [group]: data } });
+    updateReport({ parameters: { [id]: data } });
   };
 
-  const AddButton = ({ group }) => {
+  const AddButton = ({ id }) => {
     return (
       <PopupTrigger>
-        <Icon>
-          <Icons.Plus />
-        </Icon>
-        <Popup position="bottom" alignment="start">
-          {(close, element) => {
+        <TooltipPopup label={formatMessage(labels.add)} position="top">
+          <Icon>
+            <Icons.Plus />
+          </Icon>
+        </TooltipPopup>
+        <Popup position="bottom" alignment="start" className={styles.popup}>
+          {close => {
             return (
-              <FieldAddForm
-                fields={fieldOptions}
-                group={group}
-                element={element}
-                onAdd={handleAdd}
-                onClose={close}
-              />
+              <PopupForm onClose={close}>
+                {id === 'fields' && (
+                  <FieldSelectForm
+                    items={fieldOptions}
+                    onSelect={handleAdd.bind(null, id)}
+                    showType={false}
+                  />
+                )}
+                {id === 'filters' && (
+                  <FilterSelectForm
+                    websiteId={websiteId}
+                    items={fieldOptions}
+                    onSelect={handleAdd.bind(null, id)}
+                  />
+                )}
+              </PopupForm>
             );
           }}
         </Popup>
@@ -74,41 +109,33 @@ export function InsightsParameters() {
   return (
     <Form ref={ref} values={parameters} onSubmit={handleSubmit}>
       <BaseParameters />
-      {parameterGroups.map(({ label, group }) => {
-        return (
-          <FormRow key={label} label={label} action={<AddButton group={group} onAdd={handleAdd} />}>
-            <ParameterList
-              items={parameterData[group]}
-              onRemove={index => handleRemove(group, index)}
-            >
-              {({ name, value }) => {
-                return (
-                  <div className={styles.parameter}>
-                    {group === REPORT_PARAMETERS.fields && (
-                      <>
-                        <div>{name}</div>
-                        <div className={styles.op}>{value}</div>
-                      </>
-                    )}
-                    {group === REPORT_PARAMETERS.filters && (
-                      <>
-                        <div>{name}</div>
-                        <div className={styles.op}>{value[0]}</div>
-                        <div>{value[1]}</div>
-                      </>
-                    )}
-                    {group === REPORT_PARAMETERS.groups && (
-                      <>
-                        <div>{name}</div>
-                      </>
-                    )}
-                  </div>
-                );
-              }}
-            </ParameterList>
-          </FormRow>
-        );
-      })}
+      {parametersSelected &&
+        parameterGroups.map(({ id, label }) => {
+          return (
+            <FormRow key={label} label={label} action={<AddButton id={id} onAdd={handleAdd} />}>
+              <ParameterList items={parameterData[id]} onRemove={index => handleRemove(id, index)}>
+                {({ name, filter, value }) => {
+                  return (
+                    <div className={styles.parameter}>
+                      {id === 'fields' && (
+                        <>
+                          <div>{fieldOptions.find(f => f.name === name)?.label}</div>
+                        </>
+                      )}
+                      {id === 'filters' && (
+                        <>
+                          <div>{fieldOptions.find(f => f.name === name)?.label}</div>
+                          <div className={styles.op}>{filterLabels[filter]}</div>
+                          <div>{formatValue(value, name)}</div>
+                        </>
+                      )}
+                    </div>
+                  );
+                }}
+              </ParameterList>
+            </FormRow>
+          );
+        })}
       <FormButtons>
         <SubmitButton variant="primary" disabled={!queryEnabled} loading={isRunning}>
           {formatMessage(labels.runQuery)}
diff --git a/components/pages/reports/insights/InsightsParameters.module.css b/components/pages/reports/insights/InsightsParameters.module.css
index 06b6241497..c84f8a9e90 100644
--- a/components/pages/reports/insights/InsightsParameters.module.css
+++ b/components/pages/reports/insights/InsightsParameters.module.css
@@ -10,3 +10,8 @@
 .op {
   font-weight: bold;
 }
+
+.popup {
+  margin-top: -10px;
+  margin-left: 30px;
+}
diff --git a/components/pages/reports/insights/InsightsReport.js b/components/pages/reports/insights/InsightsReport.js
index 88f12304c5..3d855d9e86 100644
--- a/components/pages/reports/insights/InsightsReport.js
+++ b/components/pages/reports/insights/InsightsReport.js
@@ -5,10 +5,11 @@ import ReportBody from '../ReportBody';
 import InsightsParameters from './InsightsParameters';
 import InsightsTable from './InsightsTable';
 import Lightbulb from 'assets/lightbulb.svg';
+import { REPORT_TYPES } from 'lib/constants';
 
 const defaultParameters = {
-  type: 'insights',
-  parameters: { fields: [], filters: [], groups: [] },
+  type: REPORT_TYPES.insights,
+  parameters: { fields: [], filters: [] },
 };
 
 export default function InsightsReport({ reportId }) {
diff --git a/components/pages/reports/insights/InsightsTable.js b/components/pages/reports/insights/InsightsTable.js
index a767468e47..d5422c9ef9 100644
--- a/components/pages/reports/insights/InsightsTable.js
+++ b/components/pages/reports/insights/InsightsTable.js
@@ -1,17 +1,47 @@
-import { useContext } from 'react';
+import { useContext, useEffect, useState } from 'react';
 import { GridTable, GridColumn } from 'react-basics';
-import { useMessages } from 'hooks';
+import { useFormat, useMessages } from 'hooks';
 import { ReportContext } from '../Report';
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
 
 export function InsightsTable() {
+  const [fields, setFields] = useState();
   const { report } = useContext(ReportContext);
   const { formatMessage, labels } = useMessages();
+  const { formatValue } = useFormat();
+
+  useEffect(
+    () => {
+      setFields(report?.parameters?.fields);
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [report?.data],
+  );
+
+  if (!fields || !report?.parameters) {
+    return <EmptyPlaceholder />;
+  }
 
   return (
     <GridTable data={report?.data || []}>
-      <GridColumn name="field" label={formatMessage(labels.field)} />
-      <GridColumn name="value" label={formatMessage(labels.value)} />
-      <GridColumn name="total" label={formatMessage(labels.total)} />
+      {fields.map(({ name, label }) => {
+        return (
+          <GridColumn key={name} name={name} label={label}>
+            {row => formatValue(row[name], name)}
+          </GridColumn>
+        );
+      })}
+      <GridColumn
+        name="visitors"
+        label={formatMessage(labels.visitors)}
+        width="100px"
+        alignment="end"
+      >
+        {row => row.visitors.toLocaleString()}
+      </GridColumn>
+      <GridColumn name="views" label={formatMessage(labels.views)} width="100px" alignment="end">
+        {row => row.views.toLocaleString()}
+      </GridColumn>
     </GridTable>
   );
 }
diff --git a/components/pages/reports/retention/RetentionParameters.js b/components/pages/reports/retention/RetentionParameters.js
new file mode 100644
index 0000000000..d98608ae73
--- /dev/null
+++ b/components/pages/reports/retention/RetentionParameters.js
@@ -0,0 +1,46 @@
+import { useContext, useRef } from 'react';
+import { useMessages } from 'hooks';
+import { Form, FormButtons, FormRow, SubmitButton } from 'react-basics';
+import { ReportContext } from 'components/pages/reports/Report';
+import { MonthSelect } from 'components/input/MonthSelect';
+import BaseParameters from '../BaseParameters';
+import { parseDateRange } from 'lib/date';
+
+export function RetentionParameters() {
+  const { report, runReport, isRunning, updateReport } = useContext(ReportContext);
+  const { formatMessage, labels } = useMessages();
+  const ref = useRef(null);
+
+  const { parameters } = report || {};
+  const { websiteId, dateRange } = parameters || {};
+  const { startDate } = dateRange || {};
+  const queryDisabled = !websiteId || !dateRange;
+
+  const handleSubmit = (data, e) => {
+    e.stopPropagation();
+    e.preventDefault();
+    if (!queryDisabled) {
+      runReport(data);
+    }
+  };
+
+  const handleDateChange = value => {
+    updateReport({ parameters: { dateRange: { ...parseDateRange(value) } } });
+  };
+
+  return (
+    <Form ref={ref} values={parameters} onSubmit={handleSubmit} preventSubmit={true}>
+      <BaseParameters showDateSelect={false} />
+      <FormRow label={formatMessage(labels.date)}>
+        <MonthSelect date={startDate} onChange={handleDateChange} />
+      </FormRow>
+      <FormButtons>
+        <SubmitButton variant="primary" disabled={queryDisabled} loading={isRunning}>
+          {formatMessage(labels.runQuery)}
+        </SubmitButton>
+      </FormButtons>
+    </Form>
+  );
+}
+
+export default RetentionParameters;
diff --git a/components/pages/reports/retention/RetentionReport.js b/components/pages/reports/retention/RetentionReport.js
new file mode 100644
index 0000000000..a9aaeb3e7a
--- /dev/null
+++ b/components/pages/reports/retention/RetentionReport.js
@@ -0,0 +1,33 @@
+import RetentionTable from './RetentionTable';
+import RetentionParameters from './RetentionParameters';
+import Report from '../Report';
+import ReportHeader from '../ReportHeader';
+import ReportMenu from '../ReportMenu';
+import ReportBody from '../ReportBody';
+import Magnet from 'assets/magnet.svg';
+import { REPORT_TYPES } from 'lib/constants';
+import { parseDateRange } from 'lib/date';
+import { endOfMonth, startOfMonth } from 'date-fns';
+
+const defaultParameters = {
+  type: REPORT_TYPES.retention,
+  parameters: {
+    dateRange: parseDateRange(
+      `range:${startOfMonth(new Date()).getTime()}:${endOfMonth(new Date()).getTime()}`,
+    ),
+  },
+};
+
+export default function RetentionReport({ reportId }) {
+  return (
+    <Report reportId={reportId} defaultParameters={defaultParameters}>
+      <ReportHeader icon={<Magnet />} />
+      <ReportMenu>
+        <RetentionParameters />
+      </ReportMenu>
+      <ReportBody>
+        <RetentionTable />
+      </ReportBody>
+    </Report>
+  );
+}
diff --git a/components/pages/reports/retention/RetentionReport.module.css b/components/pages/reports/retention/RetentionReport.module.css
new file mode 100644
index 0000000000..aed66b74ef
--- /dev/null
+++ b/components/pages/reports/retention/RetentionReport.module.css
@@ -0,0 +1,10 @@
+.filters {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  border: 1px solid var(--base400);
+  border-radius: var(--border-radius);
+  line-height: 32px;
+  padding: 10px;
+  overflow: hidden;
+}
diff --git a/components/pages/reports/retention/RetentionTable.js b/components/pages/reports/retention/RetentionTable.js
new file mode 100644
index 0000000000..df0b0f99f7
--- /dev/null
+++ b/components/pages/reports/retention/RetentionTable.js
@@ -0,0 +1,78 @@
+import { useContext } from 'react';
+import classNames from 'classnames';
+import { ReportContext } from '../Report';
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
+import { useMessages } from 'hooks';
+import { formatDate } from 'lib/date';
+import styles from './RetentionTable.module.css';
+
+export function RetentionTable() {
+  const { formatMessage, labels } = useMessages();
+  const { report } = useContext(ReportContext);
+  const { data } = report || {};
+
+  if (!data) {
+    return <EmptyPlaceholder />;
+  }
+
+  const days = [1, 2, 3, 4, 5, 6, 7, 14, 21, 28];
+
+  const rows = data.reduce((arr, row) => {
+    const { date, visitors, day } = row;
+    if (day === 0) {
+      return arr.concat({
+        date,
+        visitors,
+        records: days
+          .reduce((arr, day) => {
+            arr[day] = data.find(x => x.date === date && x.day === day);
+            return arr;
+          }, [])
+          .filter(n => n),
+      });
+    }
+    return arr;
+  }, []);
+
+  const totalDays = rows.length;
+
+  return (
+    <>
+      <div className={styles.table}>
+        <div className={classNames(styles.row, styles.header)}>
+          <div className={styles.date}>{formatMessage(labels.date)}</div>
+          <div className={styles.visitors}>{formatMessage(labels.visitors)}</div>
+          {days.map(n => (
+            <div key={n} className={styles.day}>
+              {formatMessage(labels.day)} {n}
+            </div>
+          ))}
+        </div>
+        {rows.map(({ date, visitors, records }, rowIndex) => {
+          return (
+            <div key={rowIndex} className={styles.row}>
+              <div className={styles.date}>{formatDate(`${date} 00:00:00`, 'PP')}</div>
+              <div className={styles.visitors}>{visitors}</div>
+              {days.map(day => {
+                if (totalDays - rowIndex < day) {
+                  return null;
+                }
+                const percentage = records[day]?.percentage;
+                return (
+                  <div
+                    key={day}
+                    className={classNames(styles.cell, { [styles.empty]: !percentage })}
+                  >
+                    {percentage ? `${percentage.toFixed(2)}%` : ''}
+                  </div>
+                );
+              })}
+            </div>
+          );
+        })}
+      </div>
+    </>
+  );
+}
+
+export default RetentionTable;
diff --git a/components/pages/reports/retention/RetentionTable.module.css b/components/pages/reports/retention/RetentionTable.module.css
new file mode 100644
index 0000000000..bfe3ac1c4a
--- /dev/null
+++ b/components/pages/reports/retention/RetentionTable.module.css
@@ -0,0 +1,52 @@
+.table {
+  display: flex;
+  flex-direction: column;
+}
+
+.header {
+  font-weight: 700;
+}
+
+.row {
+  display: flex;
+  flex-direction: row;
+  gap: 1px;
+  margin-bottom: 1px;
+}
+
+.cell {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  background: var(--blue200);
+  border-radius: var(--border-radius);
+}
+
+.date {
+  display: flex;
+  align-items: center;
+  min-width: 160px;
+}
+
+.visitors {
+  display: flex;
+  align-items: center;
+  min-width: 80px;
+}
+
+.day {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 60px;
+  height: 60px;
+  text-align: center;
+  font-size: var(--font-size-sm);
+  font-weight: 400;
+}
+
+.empty {
+  background: var(--blue100);
+}
diff --git a/components/pages/settings/teams/TeamAddWebsiteForm.js b/components/pages/settings/teams/TeamAddWebsiteForm.js
index cc815d934b..4a74de6eaa 100644
--- a/components/pages/settings/teams/TeamAddWebsiteForm.js
+++ b/components/pages/settings/teams/TeamAddWebsiteForm.js
@@ -12,6 +12,8 @@ export function TeamAddWebsiteForm({ teamId, onSave, onClose }) {
   const [newWebsites, setNewWebsites] = useState([]);
   const formRef = useRef();
 
+  const hasData = websites && websites.data.length > 0;
+
   const handleSubmit = () => {
     mutate(
       { websiteIds: newWebsites },
@@ -42,20 +44,22 @@ export function TeamAddWebsiteForm({ teamId, onSave, onClose }) {
 
   return (
     <>
-      <Form onSubmit={handleSubmit} error={error} ref={formRef}>
-        <FormRow label={formatMessage(labels.websites)}>
-          <Dropdown items={websites} onChange={handleAddWebsite} style={{ width: 300 }}>
-            {({ id, name }) => <Item key={id}>{name}</Item>}
-          </Dropdown>
-        </FormRow>
-        <WebsiteTags items={websites} websites={newWebsites} onClick={handleRemoveWebsite} />
-        <FormButtons flex>
-          <SubmitButton disabled={newWebsites && newWebsites.length === 0}>
-            {formatMessage(labels.addWebsite)}
-          </SubmitButton>
-          <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
-        </FormButtons>
-      </Form>
+      {hasData && (
+        <Form onSubmit={handleSubmit} error={error} ref={formRef}>
+          <FormRow label={formatMessage(labels.websites)}>
+            <Dropdown items={websites.data} onChange={handleAddWebsite} style={{ width: 300 }}>
+              {({ id, name }) => <Item key={id}>{name}</Item>}
+            </Dropdown>
+          </FormRow>
+          <WebsiteTags items={websites.data} websites={newWebsites} onClick={handleRemoveWebsite} />
+          <FormButtons flex>
+            <SubmitButton disabled={newWebsites && newWebsites.length === 0}>
+              {formatMessage(labels.addWebsite)}
+            </SubmitButton>
+            <Button onClick={onClose}>{formatMessage(labels.cancel)}</Button>
+          </FormButtons>
+        </Form>
+      )}
     </>
   );
 }
diff --git a/components/pages/settings/teams/TeamMembers.js b/components/pages/settings/teams/TeamMembers.js
index 3ea8232cea..9762ef2976 100644
--- a/components/pages/settings/teams/TeamMembers.js
+++ b/components/pages/settings/teams/TeamMembers.js
@@ -2,13 +2,22 @@ import { Loading, useToasts } from 'react-basics';
 import TeamMembersTable from 'components/pages/settings/teams/TeamMembersTable';
 import useApi from 'hooks/useApi';
 import useMessages from 'hooks/useMessages';
+import useApiFilter from 'hooks/useApiFilter';
 
 export function TeamMembers({ teamId, readOnly }) {
   const { showToast } = useToasts();
-  const { get, useQuery } = useApi();
   const { formatMessage, messages } = useMessages();
-  const { data, isLoading, refetch } = useQuery(['teams:users', teamId], () =>
-    get(`/teams/${teamId}/users`),
+  const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
+    useApiFilter();
+  const { get, useQuery } = useApi();
+  const { data, isLoading, refetch } = useQuery(
+    ['teams:users', teamId, filter, page, pageSize],
+    () =>
+      get(`/teams/${teamId}/users`, {
+        filter,
+        page,
+        pageSize,
+      }),
   );
 
   if (isLoading) {
@@ -22,7 +31,15 @@ export function TeamMembers({ teamId, readOnly }) {
 
   return (
     <>
-      <TeamMembersTable onSave={handleSave} data={data} readOnly={readOnly} />
+      <TeamMembersTable
+        onSave={handleSave}
+        data={data}
+        readOnly={readOnly}
+        onFilterChange={handleFilterChange}
+        onPageChange={handlePageChange}
+        onPageSizeChange={handlePageSizeChange}
+        filterValue={filter}
+      />
     </>
   );
 }
diff --git a/components/pages/settings/teams/TeamMembersTable.js b/components/pages/settings/teams/TeamMembersTable.js
index 8e6fad82e1..daa4acc6dc 100644
--- a/components/pages/settings/teams/TeamMembersTable.js
+++ b/components/pages/settings/teams/TeamMembersTable.js
@@ -4,7 +4,15 @@ import { ROLES } from 'lib/constants';
 import TeamMemberRemoveButton from './TeamMemberRemoveButton';
 import SettingsTable from 'components/common/SettingsTable';
 
-export function TeamMembersTable({ data = [], onSave, readOnly }) {
+export function TeamMembersTable({
+  data = [],
+  onSave,
+  readOnly,
+  filterValue,
+  onFilterChange,
+  onPageChange,
+  onPageSizeChange,
+}) {
   const { formatMessage, labels } = useMessages();
   const { user } = useUser();
 
@@ -16,7 +24,7 @@ export function TeamMembersTable({ data = [], onSave, readOnly }) {
 
   const cellRender = (row, data, key) => {
     if (key === 'username') {
-      return row?.user?.username;
+      return row?.username;
     }
     if (key === 'role') {
       return formatMessage(
@@ -27,13 +35,23 @@ export function TeamMembersTable({ data = [], onSave, readOnly }) {
   };
 
   return (
-    <SettingsTable data={data} columns={columns} cellRender={cellRender}>
+    <SettingsTable
+      data={data}
+      columns={columns}
+      cellRender={cellRender}
+      showSearch={true}
+      showPaging={true}
+      onFilterChange={onFilterChange}
+      onPageChange={onPageChange}
+      onPageSizeChange={onPageSizeChange}
+      filterValue={filterValue}
+    >
       {row => {
         return (
           !readOnly && (
             <TeamMemberRemoveButton
               teamId={row.teamId}
-              userId={row.userId}
+              userId={row.id}
               disabled={user.id === row?.user?.id || row.role === ROLES.teamOwner}
               onSave={onSave}
             />
diff --git a/components/pages/settings/teams/TeamWebsites.js b/components/pages/settings/teams/TeamWebsites.js
index 9a5761e56f..2ae344f57a 100644
--- a/components/pages/settings/teams/TeamWebsites.js
+++ b/components/pages/settings/teams/TeamWebsites.js
@@ -13,13 +13,22 @@ import TeamWebsitesTable from 'components/pages/settings/teams/TeamWebsitesTable
 import TeamAddWebsiteForm from 'components/pages/settings/teams/TeamAddWebsiteForm';
 import useApi from 'hooks/useApi';
 import useMessages from 'hooks/useMessages';
+import useApiFilter from 'hooks/useApiFilter';
 
 export function TeamWebsites({ teamId }) {
   const { showToast } = useToasts();
   const { formatMessage, labels, messages } = useMessages();
+  const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
+    useApiFilter();
   const { get, useQuery } = useApi();
-  const { data, isLoading, refetch } = useQuery(['teams:websites', teamId], () =>
-    get(`/teams/${teamId}/websites`),
+  const { data, isLoading, refetch } = useQuery(
+    ['teams:websites', teamId, filter, page, pageSize],
+    () =>
+      get(`/teams/${teamId}/websites`, {
+        filter,
+        page,
+        pageSize,
+      }),
   );
   const hasData = data && data.length !== 0;
 
@@ -49,7 +58,17 @@ export function TeamWebsites({ teamId }) {
   return (
     <div>
       <ActionForm description={formatMessage(messages.teamWebsitesInfo)}>{addButton}</ActionForm>
-      {hasData && <TeamWebsitesTable teamId={teamId} data={data} onSave={handleSave} />}
+      {hasData && (
+        <TeamWebsitesTable
+          teamId={teamId}
+          data={data}
+          onSave={handleSave}
+          onFilterChange={handleFilterChange}
+          onPageChange={handlePageChange}
+          onPageSizeChange={handlePageSizeChange}
+          filterValue={filter}
+        />
+      )}
     </div>
   );
 }
diff --git a/components/pages/settings/teams/TeamWebsitesTable.js b/components/pages/settings/teams/TeamWebsitesTable.js
index 4873c6c726..564c8a7823 100644
--- a/components/pages/settings/teams/TeamWebsitesTable.js
+++ b/components/pages/settings/teams/TeamWebsitesTable.js
@@ -6,9 +6,17 @@ import TeamWebsiteRemoveButton from './TeamWebsiteRemoveButton';
 import SettingsTable from 'components/common/SettingsTable';
 import useConfig from 'hooks/useConfig';
 
-export function TeamWebsitesTable({ data = [], onSave }) {
+export function TeamWebsitesTable({
+  data = [],
+  onSave,
+  filterValue,
+  onFilterChange,
+  onPageChange,
+  onPageSizeChange,
+}) {
   const { formatMessage, labels } = useMessages();
   const { openExternal } = useConfig();
+
   const { user } = useUser();
   const columns = [
     { name: 'name', label: formatMessage(labels.name) },
@@ -17,11 +25,19 @@ export function TeamWebsitesTable({ data = [], onSave }) {
   ];
 
   return (
-    <SettingsTable columns={columns} data={data}>
+    <SettingsTable
+      columns={columns}
+      data={data}
+      showSearch={true}
+      showPaging={true}
+      onFilterChange={onFilterChange}
+      onPageChange={onPageChange}
+      onPageSizeChange={onPageSizeChange}
+      filterValue={filterValue}
+    >
       {row => {
-        const { teamId } = row;
-        const { id: websiteId, name, domain, userId } = row.website;
-        const { teamUser } = row.team;
+        const { id: teamId, teamUser } = row.teamWebsite[0].team;
+        const { id: websiteId, name, domain, userId } = row;
         const owner = teamUser[0];
         const canRemove = user.id === userId || user.id === owner.userId;
 
diff --git a/components/pages/settings/teams/TeamsList.js b/components/pages/settings/teams/TeamsList.js
index 0c82639bf4..061100f64f 100644
--- a/components/pages/settings/teams/TeamsList.js
+++ b/components/pages/settings/teams/TeamsList.js
@@ -1,24 +1,37 @@
-import { useState } from 'react';
-import { Button, Icon, Modal, ModalTrigger, useToasts, Text, Flexbox } from 'react-basics';
 import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
-import TeamAddForm from 'components/pages/settings/teams/TeamAddForm';
+import Icons from 'components/icons';
+import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
+import TeamAddForm from 'components/pages/settings/teams/TeamAddForm';
 import TeamsTable from 'components/pages/settings/teams/TeamsTable';
-import Page from 'components/layout/Page';
-import Icons from 'components/icons';
-import TeamJoinForm from './TeamJoinForm';
 import useApi from 'hooks/useApi';
 import useMessages from 'hooks/useMessages';
-import { ROLES } from 'lib/constants';
 import useUser from 'hooks/useUser';
+import { ROLES } from 'lib/constants';
+import { useState } from 'react';
+import { Button, Flexbox, Icon, Modal, ModalTrigger, Text, useToasts } from 'react-basics';
+import TeamJoinForm from './TeamJoinForm';
+import useApiFilter from 'hooks/useApiFilter';
 
 export default function TeamsList() {
   const { user } = useUser();
   const { formatMessage, labels, messages } = useMessages();
+  const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
+    useApiFilter();
   const [update, setUpdate] = useState(0);
+
   const { get, useQuery } = useApi();
-  const { data, isLoading, error } = useQuery(['teams', update], () => get(`/teams`));
-  const hasData = data && data.length !== 0;
+  const { data, isLoading, error } = useQuery(['teams', update, filter, page, pageSize], () => {
+    return get(`/teams`, {
+      filter,
+      page,
+      pageSize,
+    });
+  });
+
+  const hasData = data && data?.data.length !== 0;
+  const isFiltered = filter;
+
   const { showToast } = useToasts();
 
   const handleSave = () => {
@@ -71,15 +84,26 @@ export default function TeamsList() {
   return (
     <Page loading={isLoading} error={error}>
       <PageHeader title={formatMessage(labels.teams)}>
-        {hasData && (
+        {(hasData || isFiltered) && (
           <Flexbox gap={10}>
             {joinButton}
             {createButton}
           </Flexbox>
         )}
       </PageHeader>
-      {hasData && <TeamsTable data={data} onDelete={handleDelete} />}
-      {!hasData && (
+
+      {(hasData || isFiltered) && (
+        <TeamsTable
+          data={data}
+          onDelete={handleDelete}
+          onFilterChange={handleFilterChange}
+          onPageChange={handlePageChange}
+          onPageSizeChange={handlePageSizeChange}
+          filterValue={filter}
+        />
+      )}
+
+      {!hasData && !isFiltered && (
         <EmptyPlaceholder message={formatMessage(messages.noTeams)}>
           <Flexbox gap={10}>
             {joinButton}
diff --git a/components/pages/settings/teams/TeamsTable.js b/components/pages/settings/teams/TeamsTable.js
index a344fefceb..e35fb839b5 100644
--- a/components/pages/settings/teams/TeamsTable.js
+++ b/components/pages/settings/teams/TeamsTable.js
@@ -1,14 +1,21 @@
+import SettingsTable from 'components/common/SettingsTable';
+import useLocale from 'hooks/useLocale';
+import useMessages from 'hooks/useMessages';
+import useUser from 'hooks/useUser';
+import { ROLES } from 'lib/constants';
 import Link from 'next/link';
 import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';
 import TeamDeleteForm from './TeamDeleteForm';
 import TeamLeaveForm from './TeamLeaveForm';
-import useMessages from 'hooks/useMessages';
-import useUser from 'hooks/useUser';
-import { ROLES } from 'lib/constants';
-import SettingsTable from 'components/common/SettingsTable';
-import useLocale from 'hooks/useLocale';
 
-export function TeamsTable({ data = [], onDelete }) {
+export function TeamsTable({
+  data = { data: [] },
+  onDelete,
+  filterValue,
+  onFilterChange,
+  onPageChange,
+  onPageSizeChange,
+}) {
   const { formatMessage, labels } = useMessages();
   const { user } = useUser();
   const { dir } = useLocale();
@@ -27,7 +34,17 @@ export function TeamsTable({ data = [], onDelete }) {
   };
 
   return (
-    <SettingsTable data={data} columns={columns} cellRender={cellRender}>
+    <SettingsTable
+      data={data}
+      columns={columns}
+      cellRender={cellRender}
+      showSearch={true}
+      showPaging={true}
+      onFilterChange={onFilterChange}
+      onPageChange={onPageChange}
+      onPageSizeChange={onPageSizeChange}
+      filterValue={filterValue}
+    >
       {row => {
         const { id, teamUser } = row;
         const owner = teamUser.find(({ role }) => role === ROLES.teamOwner);
diff --git a/components/pages/settings/users/UsersList.js b/components/pages/settings/users/UsersList.js
index 8886203b58..614aabefbf 100644
--- a/components/pages/settings/users/UsersList.js
+++ b/components/pages/settings/users/UsersList.js
@@ -7,14 +7,27 @@ import UserAddButton from './UserAddButton';
 import useApi from 'hooks/useApi';
 import useUser from 'hooks/useUser';
 import useMessages from 'hooks/useMessages';
+import useApiFilter from 'hooks/useApiFilter';
 
 export function UsersList() {
   const { formatMessage, labels, messages } = useMessages();
   const { user } = useUser();
+  const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
+    useApiFilter();
+
   const { get, useQuery } = useApi();
-  const { data, isLoading, error, refetch } = useQuery(['user'], () => get(`/users`), {
-    enabled: !!user,
-  });
+  const { data, isLoading, error, refetch } = useQuery(
+    ['user', filter, page, pageSize],
+    () =>
+      get(`/users`, {
+        filter,
+        page,
+        pageSize,
+      }),
+    {
+      enabled: !!user,
+    },
+  );
   const { showToast } = useToasts();
   const hasData = data && data.length !== 0;
 
@@ -33,8 +46,17 @@ export function UsersList() {
       <PageHeader title={formatMessage(labels.users)}>
         <UserAddButton onSave={handleSave} />
       </PageHeader>
-      {hasData && <UsersTable data={data} onDelete={handleDelete} />}
-      {!hasData && (
+      {(hasData || filter) && (
+        <UsersTable
+          data={data}
+          onDelete={handleDelete}
+          onFilterChange={handleFilterChange}
+          onPageChange={handlePageChange}
+          onPageSizeChange={handlePageSizeChange}
+          filterValue={filter}
+        />
+      )}
+      {!hasData && !filter && (
         <EmptyPlaceholder message={formatMessage(messages.noUsers)}>
           <UserAddButton onSave={handleSave} />
         </EmptyPlaceholder>
diff --git a/components/pages/settings/users/UsersTable.js b/components/pages/settings/users/UsersTable.js
index 2023efc5dd..f4c9dd77aa 100644
--- a/components/pages/settings/users/UsersTable.js
+++ b/components/pages/settings/users/UsersTable.js
@@ -8,7 +8,14 @@ import useMessages from 'hooks/useMessages';
 import SettingsTable from 'components/common/SettingsTable';
 import useLocale from 'hooks/useLocale';
 
-export function UsersTable({ data = [], onDelete }) {
+export function UsersTable({
+  data = { data: [] },
+  onDelete,
+  filterValue,
+  onFilterChange,
+  onPageChange,
+  onPageSizeChange,
+}) {
   const { formatMessage, labels } = useMessages();
   const { user } = useUser();
   const { dateLocale } = useLocale();
@@ -36,7 +43,17 @@ export function UsersTable({ data = [], onDelete }) {
   };
 
   return (
-    <SettingsTable data={data} columns={columns} cellRender={cellRender}>
+    <SettingsTable
+      data={data}
+      columns={columns}
+      cellRender={cellRender}
+      showSearch={true}
+      showPaging={true}
+      onFilterChange={onFilterChange}
+      onPageChange={onPageChange}
+      onPageSizeChange={onPageSizeChange}
+      filterValue={filterValue}
+    >
       {(row, keys, rowIndex) => {
         return (
           <>
diff --git a/components/pages/settings/websites/WebsitesList.js b/components/pages/settings/websites/WebsitesList.js
index de423d0b2b..f1a2eb0f8f 100644
--- a/components/pages/settings/websites/WebsitesList.js
+++ b/components/pages/settings/websites/WebsitesList.js
@@ -1,25 +1,41 @@
-import { Button, Icon, Text, Modal, ModalTrigger, useToasts, Icons } from 'react-basics';
 import Page from 'components/layout/Page';
 import PageHeader from 'components/layout/PageHeader';
-import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
 import WebsiteAddForm from 'components/pages/settings/websites/WebsiteAddForm';
 import WebsitesTable from 'components/pages/settings/websites/WebsitesTable';
 import useApi from 'hooks/useApi';
-import useUser from 'hooks/useUser';
+import useApiFilter from 'hooks/useApiFilter';
 import useMessages from 'hooks/useMessages';
+import useUser from 'hooks/useUser';
 import { ROLES } from 'lib/constants';
+import { Button, Icon, Icons, Modal, ModalTrigger, Text, useToasts } from 'react-basics';
 
-export function WebsitesList() {
+export function WebsitesList({
+  showTeam,
+  showEditButton = true,
+  showHeader = true,
+  includeTeams,
+  onlyTeams,
+  fetch,
+}) {
   const { formatMessage, labels, messages } = useMessages();
   const { user } = useUser();
+
+  const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
+    useApiFilter();
   const { get, useQuery } = useApi();
   const { data, isLoading, error, refetch } = useQuery(
-    ['websites', user?.id],
-    () => get(`/users/${user?.id}/websites`),
+    ['websites', fetch, user?.id, filter, page, pageSize, includeTeams, onlyTeams],
+    () =>
+      get(`/users/${user?.id}/websites`, {
+        filter,
+        page,
+        pageSize,
+        includeTeams,
+        onlyTeams,
+      }),
     { enabled: !!user },
   );
   const { showToast } = useToasts();
-  const hasData = data && data.length !== 0;
 
   const handleSave = async () => {
     await refetch();
@@ -46,13 +62,16 @@ export function WebsitesList() {
 
   return (
     <Page loading={isLoading} error={error}>
-      <PageHeader title={formatMessage(labels.websites)}>{addButton}</PageHeader>
-      {hasData && <WebsitesTable data={data} />}
-      {!hasData && (
-        <EmptyPlaceholder message={formatMessage(messages.noWebsitesConfigured)}>
-          {addButton}
-        </EmptyPlaceholder>
-      )}
+      {showHeader && <PageHeader title={formatMessage(labels.websites)}>{addButton}</PageHeader>}
+      <WebsitesTable
+        data={data}
+        showTeam={showTeam}
+        showEditButton={showEditButton}
+        onFilterChange={handleFilterChange}
+        onPageChange={handlePageChange}
+        onPageSizeChange={handlePageSizeChange}
+        filterValue={filter}
+      />
     </Page>
   );
 }
diff --git a/components/pages/settings/websites/WebsitesTable.js b/components/pages/settings/websites/WebsitesTable.js
index 902393e6b7..08c906aa0f 100644
--- a/components/pages/settings/websites/WebsitesTable.js
+++ b/components/pages/settings/websites/WebsitesTable.js
@@ -1,46 +1,89 @@
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
 import Link from 'next/link';
 import { Button, Text, Icon, Icons } from 'react-basics';
 import SettingsTable from 'components/common/SettingsTable';
 import useMessages from 'hooks/useMessages';
 import useConfig from 'hooks/useConfig';
+import useUser from 'hooks/useUser';
 
-export function WebsitesTable({ data = [] }) {
-  const { formatMessage, labels } = useMessages();
+export function WebsitesTable({
+  data = [],
+  filterValue,
+  onFilterChange,
+  onPageChange,
+  onPageSizeChange,
+  showTeam,
+  showEditButton,
+}) {
+  const { formatMessage, labels, messages } = useMessages();
   const { openExternal } = useConfig();
+  const { user } = useUser();
+
+  const showTable = data && (filterValue || data?.data.length !== 0);
+
+  const teamColumns = [
+    { name: 'teamName', label: formatMessage(labels.teamName) },
+    { name: 'owner', label: formatMessage(labels.owner) },
+  ];
 
   const columns = [
     { name: 'name', label: formatMessage(labels.name) },
     { name: 'domain', label: formatMessage(labels.domain) },
+    ...(showTeam ? teamColumns : []),
     { name: 'action', label: ' ' },
   ];
 
   return (
-    <SettingsTable columns={columns} data={data}>
-      {row => {
-        const { id } = row;
+    <>
+      {showTable && (
+        <SettingsTable
+          columns={columns}
+          data={data}
+          showSearch={true}
+          showPaging={true}
+          onFilterChange={onFilterChange}
+          onPageChange={onPageChange}
+          onPageSizeChange={onPageSizeChange}
+          filterValue={filterValue}
+        >
+          {row => {
+            const {
+              id,
+              teamWebsite,
+              user: { username, id: ownerId },
+            } = row;
+            if (showTeam) {
+              row.teamName = teamWebsite[0]?.team.name;
+              row.owner = username;
+            }
 
-        return (
-          <>
-            <Link href={`/settings/websites/${id}`}>
-              <Button>
-                <Icon>
-                  <Icons.Edit />
-                </Icon>
-                <Text>{formatMessage(labels.edit)}</Text>
-              </Button>
-            </Link>
-            <Link href={`/websites/${id}`} target={openExternal ? '_blank' : null}>
-              <Button>
-                <Icon>
-                  <Icons.External />
-                </Icon>
-                <Text>{formatMessage(labels.view)}</Text>
-              </Button>
-            </Link>
-          </>
-        );
-      }}
-    </SettingsTable>
+            return (
+              <>
+                {showEditButton && (!showTeam || ownerId === user.id) && (
+                  <Link href={`/settings/websites/${id}`}>
+                    <Button>
+                      <Icon>
+                        <Icons.Edit />
+                      </Icon>
+                      <Text>{formatMessage(labels.edit)}</Text>
+                    </Button>
+                  </Link>
+                )}
+                <Link href={`/websites/${id}`} target={openExternal ? '_blank' : null}>
+                  <Button>
+                    <Icon>
+                      <Icons.External />
+                    </Icon>
+                    <Text>{formatMessage(labels.view)}</Text>
+                  </Button>
+                </Link>
+              </>
+            );
+          }}
+        </SettingsTable>
+      )}
+      {!showTable && <EmptyPlaceholder message={formatMessage(messages.noDataAvailable)} />}
+    </>
   );
 }
 
diff --git a/components/pages/websites/WebsiteReportsPage.js b/components/pages/websites/WebsiteReportsPage.js
index 569270284a..b04c50d1dc 100644
--- a/components/pages/websites/WebsiteReportsPage.js
+++ b/components/pages/websites/WebsiteReportsPage.js
@@ -1,13 +1,25 @@
+import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
 import Page from 'components/layout/Page';
-import Link from 'next/link';
-import { Button, Icon, Icons, Text, Flexbox } from 'react-basics';
-import { useMessages, useReports } from 'hooks';
 import ReportsTable from 'components/pages/reports/ReportsTable';
+import { useMessages, useWebsiteReports } from 'hooks';
+import Link from 'next/link';
+import { Button, Flexbox, Icon, Icons, Text } from 'react-basics';
 import WebsiteHeader from './WebsiteHeader';
 
 export function WebsiteReportsPage({ websiteId }) {
-  const { formatMessage, labels } = useMessages();
-  const { reports, error, isLoading, deleteReport } = useReports(websiteId);
+  const { formatMessage, labels, messages } = useMessages();
+  const {
+    reports,
+    error,
+    isLoading,
+    deleteReport,
+    filter,
+    handleFilterChange,
+    handlePageChange,
+    handlePageSizeChange,
+  } = useWebsiteReports(websiteId);
+
+  const hasData = (reports && reports.data.length !== 0) || filter;
 
   const handleDelete = async id => {
     await deleteReport(id);
@@ -26,7 +38,17 @@ export function WebsiteReportsPage({ websiteId }) {
           </Button>
         </Link>
       </Flexbox>
-      <ReportsTable data={reports} onDelete={handleDelete} />
+      {hasData && (
+        <ReportsTable
+          data={reports}
+          onDelete={handleDelete}
+          onFilterChange={handleFilterChange}
+          onPageChange={handlePageChange}
+          onPageSizeChange={handlePageSizeChange}
+          filterValue={filter}
+        />
+      )}
+      {!hasData && <EmptyPlaceholder message={formatMessage(messages.noDataAvailable)} />}
     </Page>
   );
 }
diff --git a/components/pages/websites/WebsitesPage.js b/components/pages/websites/WebsitesPage.js
new file mode 100644
index 0000000000..fafc62afd8
--- /dev/null
+++ b/components/pages/websites/WebsitesPage.js
@@ -0,0 +1,77 @@
+import Page from 'components/layout/Page';
+import PageHeader from 'components/layout/PageHeader';
+import WebsiteAddForm from 'components/pages/settings/websites/WebsiteAddForm';
+import WebsiteList from 'components/pages/settings/websites/WebsitesList';
+import { useMessages } from 'hooks';
+import useUser from 'hooks/useUser';
+import useConfig from 'hooks/useConfig';
+import { ROLES } from 'lib/constants';
+import { useState } from 'react';
+import {
+  Button,
+  Icon,
+  Icons,
+  Item,
+  Modal,
+  ModalTrigger,
+  Tabs,
+  Text,
+  useToasts,
+} from 'react-basics';
+
+export function WebsitesPage() {
+  const { formatMessage, labels, messages } = useMessages();
+  const [tab, setTab] = useState('my-websites');
+  const [fetch, setFetch] = useState(1);
+  const { user } = useUser();
+  const { cloudMode } = useConfig();
+  const { showToast } = useToasts();
+
+  const handleSave = async () => {
+    setFetch(fetch + 1);
+    showToast({ message: formatMessage(messages.saved), variant: 'success' });
+  };
+
+  const addButton = (
+    <>
+      {user.role !== ROLES.viewOnly && (
+        <ModalTrigger>
+          <Button variant="primary">
+            <Icon>
+              <Icons.Plus />
+            </Icon>
+            <Text>{formatMessage(labels.addWebsite)}</Text>
+          </Button>
+          <Modal title={formatMessage(labels.addWebsite)}>
+            {close => <WebsiteAddForm onSave={handleSave} onClose={close} />}
+          </Modal>
+        </ModalTrigger>
+      )}
+    </>
+  );
+
+  return (
+    <Page>
+      <PageHeader title={formatMessage(labels.websites)}>{!cloudMode && addButton}</PageHeader>
+      <Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30 }}>
+        <Item key="my-websites">{formatMessage(labels.myWebsites)}</Item>
+        <Item key="team-webaites">{formatMessage(labels.teamWebsites)}</Item>
+      </Tabs>
+
+      {tab === 'my-websites' && (
+        <WebsiteList showEditButton={!cloudMode} showHeader={false} fetch={fetch} />
+      )}
+      {tab === 'team-webaites' && (
+        <WebsiteList
+          showEditButton={!cloudMode}
+          showHeader={false}
+          fetch={fetch}
+          showTeam={true}
+          onlyTeams={true}
+        />
+      )}
+    </Page>
+  );
+}
+
+export default WebsitesPage;
diff --git a/db/mysql/migrations/03_metric_performance_index/migration.sql b/db/mysql/migrations/03_metric_performance_index/migration.sql
new file mode 100644
index 0000000000..6468136479
--- /dev/null
+++ b/db/mysql/migrations/03_metric_performance_index/migration.sql
@@ -0,0 +1,50 @@
+-- CreateIndex
+CREATE INDEX `event_data_website_id_created_at_idx` ON `event_data`(`website_id`, `created_at`);
+
+-- CreateIndex
+CREATE INDEX `event_data_website_id_created_at_event_key_idx` ON `event_data`(`website_id`, `created_at`, `event_key`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_idx` ON `session`(`website_id`, `created_at`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_hostname_idx` ON `session`(`website_id`, `created_at`, `hostname`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_browser_idx` ON `session`(`website_id`, `created_at`, `browser`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_os_idx` ON `session`(`website_id`, `created_at`, `os`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_device_idx` ON `session`(`website_id`, `created_at`, `device`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_screen_idx` ON `session`(`website_id`, `created_at`, `screen`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_language_idx` ON `session`(`website_id`, `created_at`, `language`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_country_idx` ON `session`(`website_id`, `created_at`, `country`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_subdivision1_idx` ON `session`(`website_id`, `created_at`, `subdivision1`);
+
+-- CreateIndex
+CREATE INDEX `session_website_id_created_at_city_idx` ON `session`(`website_id`, `created_at`, `city`);
+
+-- CreateIndex
+CREATE INDEX `website_event_website_id_created_at_url_path_idx` ON `website_event`(`website_id`, `created_at`, `url_path`);
+
+-- CreateIndex
+CREATE INDEX `website_event_website_id_created_at_url_query_idx` ON `website_event`(`website_id`, `created_at`, `url_query`);
+
+-- CreateIndex
+CREATE INDEX `website_event_website_id_created_at_referrer_domain_idx` ON `website_event`(`website_id`, `created_at`, `referrer_domain`);
+
+-- CreateIndex
+CREATE INDEX `website_event_website_id_created_at_page_title_idx` ON `website_event`(`website_id`, `created_at`, `page_title`);
+
+-- CreateIndex
+CREATE INDEX `website_event_website_id_created_at_event_name_idx` ON `website_event`(`website_id`, `created_at`, `event_name`);
diff --git a/db/mysql/schema.prisma b/db/mysql/schema.prisma
index a25405dffa..38bb91f4be 100644
--- a/db/mysql/schema.prisma
+++ b/db/mysql/schema.prisma
@@ -44,6 +44,16 @@ model Session {
 
   @@index([createdAt])
   @@index([websiteId])
+  @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, hostname])
+  @@index([websiteId, createdAt, browser])
+  @@index([websiteId, createdAt, os])
+  @@index([websiteId, createdAt, device])
+  @@index([websiteId, createdAt, screen])
+  @@index([websiteId, createdAt, language])
+  @@index([websiteId, createdAt, country])
+  @@index([websiteId, createdAt, subdivision1])
+  @@index([websiteId, createdAt, city])
   @@map("session")
 }
 
@@ -91,6 +101,11 @@ model WebsiteEvent {
   @@index([sessionId])
   @@index([websiteId])
   @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, urlPath])
+  @@index([websiteId, createdAt, urlQuery])
+  @@index([websiteId, createdAt, referrerDomain])
+  @@index([websiteId, createdAt, pageTitle])
+  @@index([websiteId, createdAt, eventName])
   @@index([websiteId, sessionId, createdAt])
   @@map("website_event")
 }
@@ -113,6 +128,8 @@ model EventData {
   @@index([websiteId])
   @@index([websiteEventId])
   @@index([websiteId, websiteEventId, createdAt])
+  @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, eventKey])
   @@map("event_data")
 }
 
diff --git a/db/postgresql/migrations/03_metric_performance_index/migration.sql b/db/postgresql/migrations/03_metric_performance_index/migration.sql
new file mode 100644
index 0000000000..5db7aa50c8
--- /dev/null
+++ b/db/postgresql/migrations/03_metric_performance_index/migration.sql
@@ -0,0 +1,50 @@
+-- CreateIndex
+CREATE INDEX "event_data_website_id_created_at_idx" ON "event_data"("website_id", "created_at");
+
+-- CreateIndex
+CREATE INDEX "event_data_website_id_created_at_event_key_idx" ON "event_data"("website_id", "created_at", "event_key");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_idx" ON "session"("website_id", "created_at");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_hostname_idx" ON "session"("website_id", "created_at", "hostname");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_browser_idx" ON "session"("website_id", "created_at", "browser");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_os_idx" ON "session"("website_id", "created_at", "os");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_device_idx" ON "session"("website_id", "created_at", "device");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_screen_idx" ON "session"("website_id", "created_at", "screen");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_language_idx" ON "session"("website_id", "created_at", "language");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_country_idx" ON "session"("website_id", "created_at", "country");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_subdivision1_idx" ON "session"("website_id", "created_at", "subdivision1");
+
+-- CreateIndex
+CREATE INDEX "session_website_id_created_at_city_idx" ON "session"("website_id", "created_at", "city");
+
+-- CreateIndex
+CREATE INDEX "website_event_website_id_created_at_url_path_idx" ON "website_event"("website_id", "created_at", "url_path");
+
+-- CreateIndex
+CREATE INDEX "website_event_website_id_created_at_url_query_idx" ON "website_event"("website_id", "created_at", "url_query");
+
+-- CreateIndex
+CREATE INDEX "website_event_website_id_created_at_referrer_domain_idx" ON "website_event"("website_id", "created_at", "referrer_domain");
+
+-- CreateIndex
+CREATE INDEX "website_event_website_id_created_at_page_title_idx" ON "website_event"("website_id", "created_at", "page_title");
+
+-- CreateIndex
+CREATE INDEX "website_event_website_id_created_at_event_name_idx" ON "website_event"("website_id", "created_at", "event_name");
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma
index 5753c6ef7e..d7a70ab055 100644
--- a/db/postgresql/schema.prisma
+++ b/db/postgresql/schema.prisma
@@ -44,6 +44,16 @@ model Session {
 
   @@index([createdAt])
   @@index([websiteId])
+  @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, hostname])
+  @@index([websiteId, createdAt, browser])
+  @@index([websiteId, createdAt, os])
+  @@index([websiteId, createdAt, device])
+  @@index([websiteId, createdAt, screen])
+  @@index([websiteId, createdAt, language])
+  @@index([websiteId, createdAt, country])
+  @@index([websiteId, createdAt, subdivision1])
+  @@index([websiteId, createdAt, city])
   @@map("session")
 }
 
@@ -91,6 +101,11 @@ model WebsiteEvent {
   @@index([sessionId])
   @@index([websiteId])
   @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, urlPath])
+  @@index([websiteId, createdAt, urlQuery])
+  @@index([websiteId, createdAt, referrerDomain])
+  @@index([websiteId, createdAt, pageTitle])
+  @@index([websiteId, createdAt, eventName])
   @@index([websiteId, sessionId, createdAt])
   @@map("website_event")
 }
@@ -112,6 +127,8 @@ model EventData {
   @@index([createdAt])
   @@index([websiteId])
   @@index([websiteEventId])
+  @@index([websiteId, createdAt])
+  @@index([websiteId, createdAt, eventKey])
   @@map("event_data")
 }
 
diff --git a/hooks/index.js b/hooks/index.js
index 6a9b3b353a..2596ba57ef 100644
--- a/hooks/index.js
+++ b/hooks/index.js
@@ -6,6 +6,7 @@ export * from './useDocumentClick';
 export * from './useEscapeKey';
 export * from './useFilters';
 export * from './useForceUpdate';
+export * from './useFormat';
 export * from './useLanguageNames';
 export * from './useLocale';
 export * from './useMessages';
@@ -19,3 +20,4 @@ export * from './useTheme';
 export * from './useTimezone';
 export * from './useUser';
 export * from './useWebsite';
+export * from './useWebsiteReports';
diff --git a/hooks/useApiFilter.ts b/hooks/useApiFilter.ts
new file mode 100644
index 0000000000..d411fd434f
--- /dev/null
+++ b/hooks/useApiFilter.ts
@@ -0,0 +1,28 @@
+import { useState } from 'react';
+
+export function useApiFilter() {
+  const [filter, setFilter] = useState();
+  const [filterType, setFilterType] = useState('All');
+  const [page, setPage] = useState(1);
+  const [pageSize, setPageSize] = useState(10);
+
+  const handleFilterChange = value => setFilter(value);
+  const handlePageChange = value => setPage(value);
+  const handlePageSizeChange = value => setPageSize(value);
+
+  return {
+    filter,
+    setFilter,
+    filterType,
+    setFilterType,
+    page,
+    setPage,
+    pageSize,
+    setPageSize,
+    handleFilterChange,
+    handlePageChange,
+    handlePageSizeChange,
+  };
+}
+
+export default useApiFilter;
diff --git a/hooks/useFilters.js b/hooks/useFilters.js
index 5126838266..089f2ee84c 100644
--- a/hooks/useFilters.js
+++ b/hooks/useFilters.js
@@ -1,33 +1,47 @@
 import { useMessages } from 'hooks';
+import { OPERATORS } from 'lib/constants';
 
 export function useFilters() {
   const { formatMessage, labels } = useMessages();
 
-  const filters = {
-    eq: formatMessage(labels.equals),
-    neq: formatMessage(labels.doesNotEqual),
-    c: formatMessage(labels.contains),
-    dnc: formatMessage(labels.doesNotContain),
-    t: formatMessage(labels.true),
-    f: formatMessage(labels.false),
-    gt: formatMessage(labels.greaterThan),
-    lt: formatMessage(labels.lessThan),
-    gte: formatMessage(labels.greaterThanEquals),
-    lte: formatMessage(labels.lessThanEquals),
-    be: formatMessage(labels.before),
-    af: formatMessage(labels.after),
+  const filterLabels = {
+    [OPERATORS.equals]: formatMessage(labels.is),
+    [OPERATORS.notEquals]: formatMessage(labels.isNot),
+    [OPERATORS.set]: formatMessage(labels.isSet),
+    [OPERATORS.notSet]: formatMessage(labels.isNotSet),
+    [OPERATORS.contains]: formatMessage(labels.contains),
+    [OPERATORS.doesNotContain]: formatMessage(labels.doesNotContain),
+    [OPERATORS.true]: formatMessage(labels.true),
+    [OPERATORS.false]: formatMessage(labels.false),
+    [OPERATORS.greaterThan]: formatMessage(labels.greaterThan),
+    [OPERATORS.lessThan]: formatMessage(labels.lessThan),
+    [OPERATORS.greaterThanEquals]: formatMessage(labels.greaterThanEquals),
+    [OPERATORS.lessThanEquals]: formatMessage(labels.lessThanEquals),
+    [OPERATORS.before]: formatMessage(labels.before),
+    [OPERATORS.after]: formatMessage(labels.after),
   };
 
-  const types = {
-    string: ['eq', 'neq'],
-    array: ['c', 'dnc'],
-    boolean: ['t', 'f'],
-    number: ['eq', 'neq', 'gt', 'lt', 'gte', 'lte'],
-    date: ['be', 'af'],
-    uuid: ['eq'],
+  const typeFilters = {
+    string: [OPERATORS.equals, OPERATORS.notEquals],
+    array: [OPERATORS.contains, OPERATORS.doesNotContain],
+    boolean: [OPERATORS.true, OPERATORS.false],
+    number: [
+      OPERATORS.equals,
+      OPERATORS.notEquals,
+      OPERATORS.greaterThan,
+      OPERATORS.lessThan,
+      OPERATORS.greaterThanEquals,
+      OPERATORS.lessThanEquals,
+    ],
+    date: [OPERATORS.before, OPERATORS.after],
+    uuid: [OPERATORS.equals],
   };
 
-  return { filters, types };
+  const getFilters = type => {
+    return typeFilters[type]?.map(key => ({ type, value: key, label: filterLabels[key] })) ?? [];
+  };
+
+  return { getFilters, filterLabels, typeFilters };
 }
 
 export default useFilters;
diff --git a/hooks/useFormat.js b/hooks/useFormat.js
new file mode 100644
index 0000000000..3fd10ec8ec
--- /dev/null
+++ b/hooks/useFormat.js
@@ -0,0 +1,39 @@
+import useMessages from './useMessages';
+import { BROWSERS } from 'lib/constants';
+import useLocale from './useLocale';
+import useCountryNames from './useCountryNames';
+
+export function useFormat() {
+  const { formatMessage, labels } = useMessages();
+  const { locale } = useLocale();
+  const countryNames = useCountryNames(locale);
+
+  const formatBrowser = value => {
+    return BROWSERS[value] || value;
+  };
+
+  const formatCountry = value => {
+    return countryNames[value] || value;
+  };
+
+  const formatDevice = value => {
+    return formatMessage(labels[value] || labels.unknown);
+  };
+
+  const formatValue = (value, type) => {
+    switch (type) {
+      case 'browser':
+        return formatBrowser(value);
+      case 'country':
+        return formatCountry(value);
+      case 'device':
+        return formatDevice(value);
+      default:
+        return value;
+    }
+  };
+
+  return { formatBrowser, formatCountry, formatDevice, formatValue };
+}
+
+export default useFormat;
diff --git a/hooks/useMessages.js b/hooks/useMessages.js
index 0719afd8dd..e3a6c20bef 100644
--- a/hooks/useMessages.js
+++ b/hooks/useMessages.js
@@ -2,13 +2,17 @@ import { useIntl, FormattedMessage } from 'react-intl';
 import { messages, labels } from 'components/messages';
 
 export function useMessages() {
-  const { formatMessage } = useIntl();
+  const intl = useIntl();
 
-  function getMessage(id) {
+  const getMessage = id => {
     const message = Object.values(messages).find(value => value.id === id);
 
     return message ? formatMessage(message) : id;
-  }
+  };
+
+  const formatMessage = (descriptor, values, opts) => {
+    return descriptor ? intl.formatMessage(descriptor, values, opts) : null;
+  };
 
   return { formatMessage, FormattedMessage, messages, labels, getMessage };
 }
diff --git a/hooks/useReport.js b/hooks/useReport.js
index e036fc3ad2..72f90af339 100644
--- a/hooks/useReport.js
+++ b/hooks/useReport.js
@@ -1,5 +1,6 @@
 import { produce } from 'immer';
 import { useCallback, useEffect, useState } from 'react';
+import { useTimezone } from './useTimezone';
 import useApi from './useApi';
 
 const baseParameters = {
@@ -12,6 +13,7 @@ export function useReport(reportId, defaultParameters) {
   const [report, setReport] = useState(null);
   const [isRunning, setIsRunning] = useState(false);
   const { get, post } = useApi();
+  const [timezone] = useTimezone();
 
   const loadReport = async id => {
     const data = await get(`/reports/${id}`);
@@ -33,7 +35,7 @@ export function useReport(reportId, defaultParameters) {
 
       const { type } = report;
 
-      const data = await post(`/reports/${type}`, parameters);
+      const data = await post(`/reports/${type}`, { ...parameters, timezone });
 
       setReport(
         produce(state => {
diff --git a/hooks/useReports.js b/hooks/useReports.js
index f4369eec34..932fa6dc44 100644
--- a/hooks/useReports.js
+++ b/hooks/useReports.js
@@ -1,12 +1,16 @@
 import { useState } from 'react';
 import useApi from './useApi';
+import useApiFilter from 'hooks/useApiFilter';
 
-export function useReports(websiteId) {
+export function useReports() {
   const [modified, setModified] = useState(Date.now());
   const { get, useQuery, del, useMutation } = useApi();
   const { mutate } = useMutation(reportId => del(`/reports/${reportId}`));
-  const { data, error, isLoading } = useQuery(['reports:website', { websiteId, modified }], () =>
-    get(`/reports`, { websiteId }),
+  const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
+    useApiFilter();
+  const { data, error, isLoading } = useQuery(
+    ['reports', { modified, filter, page, pageSize }],
+    () => get(`/reports`, { filter, page, pageSize }),
   );
 
   const deleteReport = id => {
@@ -17,7 +21,18 @@ export function useReports(websiteId) {
     });
   };
 
-  return { reports: data, error, isLoading, deleteReport };
+  return {
+    reports: data,
+    error,
+    isLoading,
+    deleteReport,
+    filter,
+    page,
+    pageSize,
+    handleFilterChange,
+    handlePageChange,
+    handlePageSizeChange,
+  };
 }
 
 export default useReports;
diff --git a/hooks/useWebsiteReports.js b/hooks/useWebsiteReports.js
new file mode 100644
index 0000000000..3b7ec4155b
--- /dev/null
+++ b/hooks/useWebsiteReports.js
@@ -0,0 +1,38 @@
+import { useState } from 'react';
+import useApi from './useApi';
+import useApiFilter from 'hooks/useApiFilter';
+
+export function useWebsiteReports(websiteId) {
+  const [modified, setModified] = useState(Date.now());
+  const { get, useQuery, del, useMutation } = useApi();
+  const { mutate } = useMutation(reportId => del(`/reports/${reportId}`));
+  const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =
+    useApiFilter();
+  const { data, error, isLoading } = useQuery(
+    ['reports:website', { websiteId, modified, filter, page, pageSize }],
+    () => get(`/websites/${websiteId}/reports`, { websiteId, filter, page, pageSize }),
+  );
+
+  const deleteReport = id => {
+    mutate(id, {
+      onSuccess: () => {
+        setModified(Date.now());
+      },
+    });
+  };
+
+  return {
+    reports: data,
+    error,
+    isLoading,
+    deleteReport,
+    filter,
+    page,
+    pageSize,
+    handleFilterChange,
+    handlePageChange,
+    handlePageSizeChange,
+  };
+}
+
+export default useWebsiteReports;
diff --git a/lang/am-ET.json b/lang/am-ET.json
index 0764b1917b..7bed142365 100644
--- a/lang/am-ET.json
+++ b/lang/am-ET.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Add website",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "All",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Average visit time",
   "label.back": "Back",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "Cancel",
   "label.change-password": "Change password",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirm password",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Countries",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Custom range",
   "label.dashboard": "Dashboard",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Date range",
+  "label.day": "Day",
   "label.default-date-range": "Default date range",
   "label.delete": "Delete",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Delete website",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Devices",
   "label.dismiss": "Dismiss",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Edit",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event Data",
   "label.events": "Events",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Last {x} hours",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Login",
   "label.logout": "Logout",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobile",
   "label.more": "More",
+  "label.my-websites": "My websites",
   "label.name": "Name",
   "label.new-password": "New password",
   "label.none": "None",
-  "label.operating-systems": "Operating systems",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Page views",
+  "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Refresh",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Required",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Save",
@@ -99,12 +132,15 @@
   "label.settings": "Settings",
   "label.share-url": "Share URL",
   "label.single-day": "Single day",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "This month",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Today",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Tracking code",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "Unknown",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Username",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "View details",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
   "message.confirm-delete": "Are you sure you want to delete {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Incorrect username/password.",
   "message.invalid-domain": "Invalid domain. Do not include http/https.",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "No data available.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwords do not match.",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "You do not have any websites configured.",
   "message.page-not-found": "Page not found.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your settings will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "This is the publicly shared URL for {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "You do not have any websites configured.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/ar-SA.json b/lang/ar-SA.json
index 933d42f59d..0efdfee732 100644
--- a/lang/ar-SA.json
+++ b/lang/ar-SA.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "إضافة موقع",
   "label.admin": "مدير",
+  "label.after": "After",
   "label.all": "الكل",
   "label.all-time": "كل الوقت",
   "label.analytics": "تحليلات",
+  "label.average": "Average",
   "label.average-visit-time": "متوسط وقت الزيارة",
   "label.back": "للخلف",
+  "label.before": "Before",
   "label.bounce-rate": "معدل الارتداد",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "المتصفحات",
   "label.cancel": "إلغاء",
   "label.change-password": "تغيير كلمة المرور",
   "label.cities": "المدن",
+  "label.city": "City",
   "label.clear-all": "مسح الكل",
   "label.confirm": "تأكيد",
   "label.confirm-password": "تأكيد كلمة المرور",
+  "label.contains": "Contains",
   "label.continue": "متابعة",
   "label.countries": "الدول",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "انشاء مجموعة",
   "label.create-user": "انشاء مستخدم",
   "label.created": "تم الانشاء",
@@ -28,16 +37,21 @@
   "label.custom-range": "فترة مخصصة",
   "label.dashboard": "الشاشة الرئيسية",
   "label.data": "البيانات",
+  "label.date": "Date",
   "label.date-range": "فترة مخصصة",
+  "label.day": "Day",
   "label.default-date-range": "الفترة المخصصة الافتراضية",
   "label.delete": "حذف",
   "label.delete-team": "حذف مجموعة",
   "label.delete-user": "جذف مستخدم",
   "label.delete-website": "حذف الموقع",
+  "label.description": "Description",
   "label.desktop": "كمبيوتر",
   "label.details": "تفاصيل",
+  "label.device": "Device",
   "label.devices": "الأجهزة",
   "label.dismiss": "اخفاء",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "النطاق",
   "label.dropoff": "Dropoff",
   "label.edit": "تعديل",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "الأحداث",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "مجمعة",
   "label.filter-raw": "مفصلة",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "انضمام",
   "label.join-team": "الانضمام للمجموعة",
   "label.language": "اللغة",
@@ -61,17 +83,25 @@
   "label.last-hours": "اخر {x} ساعة/ساعات",
   "label.leave": "مغادرة",
   "label.leave-team": "مغادرة المجموعة",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "تسجيل الدخول",
   "label.logout": "تسجيل الخروج",
+  "label.max": "Max",
   "label.members": "الأعضاء",
+  "label.min": "Min",
   "label.mobile": "جوال",
   "label.more": "المزيد",
+  "label.my-websites": "My websites",
   "label.name": "الإسم",
   "label.new-password": "كلمة مرور جديدة",
   "label.none": "غير معرف",
-  "label.operating-systems": "نظام التشغيل",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "المالك",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "مشاهدات الصفحة",
+  "label.pageTitle": "Page title",
   "label.pages": "الصفحات",
   "label.password": "كلمة المرور",
   "label.powered-by": "مشغل بواسطة {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "متغيرات الرابط",
   "label.realtime": "الوقت الفعلي",
+  "label.referrer": "Referrer",
   "label.referrers": "التحويلات",
   "label.refresh": "تحديث",
   "label.regenerate": "اعادة انشاء",
+  "label.region": "Region",
   "label.regions": "المناطق",
   "label.remove": "إزالة",
   "label.reports": "Reports",
   "label.required": "اجباري",
   "label.reset": "اعادة تعيين",
   "label.reset-website": "اعادة تعيين الإحصائيات",
+  "label.retention": "Retention",
   "label.role": "الصلاحية",
   "label.run-query": "Run query",
   "label.save": "حفظ",
@@ -99,12 +132,15 @@
   "label.settings": "اعدادات",
   "label.share-url": "مشاركة الرابط",
   "label.single-day": "يوم واحد",
+  "label.sum": "Sum",
   "label.tablet": "تابلت",
   "label.team": "مجموعة",
   "label.team-guest": "زائر للمجموعة",
   "label.team-id": "معرف المجموعة",
   "label.team-member": "عضو المجموعة",
+  "label.team-name": "Team name",
   "label.team-owner": "مدير المجموعة",
+  "label.team-websites": "Team websites",
   "label.teams": "المجموعات",
   "label.theme": "المظهر",
   "label.this-month": "الشهر الحالي",
@@ -114,14 +150,21 @@
   "label.title": "العنوان",
   "label.today": "اليوم",
   "label.toggle-charts": "تغيير الإحصائيات",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "كود التتبع",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "زائرون فريدون",
   "label.unknown": "غير معروف",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "مستخدم",
   "label.username": "اسم المستخدم",
   "label.users": "المستخدمين",
+  "label.value": "Value",
   "label.view": "عرض",
   "label.view-details": "عرض التفاصيل",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "المواقع",
   "label.window": "Window",
   "label.yesterday": "الأمس",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} حاليا {x, plural, one {زائر واحد} other {زوار}}",
   "message.confirm-delete": "هل أنت متأكد من حذف {target}?",
   "message.confirm-leave": "هل أنت متأكد من مغادرة {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "اسم المستخدم او كلمة المرور غير صحيحة.",
   "message.invalid-domain": "النطاق غير صحيح",
   "message.min-password-length": "اقل عدد مسموح به {n} حرف/أحرف",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "لا توجد بيانات متاحة.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "كلمة المرور غير متطابقة",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "هذه المجموعة ليس لديه اي موقع.",
   "message.no-teams": "لم تقم بإنشاء اي مجموعة.",
   "message.no-users": "لا يوجد مستخدمين.",
+  "message.no-websites-configured": "لم تقم بإعداد اي موقع.",
   "message.page-not-found": "الصفحة غير موجودة.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "سيتم اعادة تعيين كافة الإحصائيات لهذا الموقع، لكن لن يتم تعيير كود التتبع",
@@ -184,12 +204,8 @@
   "message.share-url": "هذا الرابط الذي تم مشاركته بشكل عام لـ {target}.",
   "message.team-already-member": "أنت عضو في المجموعة",
   "message.team-not-found": "لم يتم العثور على المجموعة",
+  "message.team-websites-info": "يمكن مشاهدة الموقع من اي عضو في المجموعة.",
   "message.tracking-code": "كود التتبع",
   "message.user-deleted": "تم حذف المستخدم.",
-  "message.visitor-log": "زائر من {country} يستخدم {browser} على {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "هذه المجموعة ليس لديه اي موقع.",
-  "message.no-websites-configured": "لم تقم بإعداد اي موقع.",
-  "message.team-websites-info": "يمكن مشاهدة الموقع من اي عضو في المجموعة.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "زائر من {country} يستخدم {browser} على {os} {device}"
 }
diff --git a/lang/be-BY.json b/lang/be-BY.json
index bd14d98f36..32693ebd46 100644
--- a/lang/be-BY.json
+++ b/lang/be-BY.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Дадаць сайт",
   "label.admin": "Адміністратар",
+  "label.after": "After",
   "label.all": "Усё",
   "label.all-time": "Увесь час",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Сярэдняя даўжыня наведвання",
   "label.back": "Назад",
+  "label.before": "Before",
   "label.bounce-rate": "Паказчык адмоваў",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Браўзеры",
   "label.cancel": "Адмена",
   "label.change-password": "Змяніць пароль",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Падцвердзіць пароль",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Краіны",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Карыстацкі дыяпазон",
   "label.dashboard": "Інфармацыйная панэль",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Дыяпазон дат",
+  "label.day": "Day",
   "label.default-date-range": "Дыяпазон дат па змаўчанню",
   "label.delete": "Выдаліць",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Выдаліць сайт",
+  "label.description": "Description",
   "label.desktop": "Настольны ПК",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Прылады",
   "label.dismiss": "Адмена",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Дамен",
   "label.dropoff": "Dropoff",
   "label.edit": "Змяніць",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Падзеі",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Камбініаваны",
   "label.filter-raw": "Сырыя",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Мова",
@@ -61,17 +83,25 @@
   "label.last-hours": "Апошнія {x} гадзіны",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Login",
   "label.logout": "Выйсці",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Мабільны",
   "label.more": "Болей",
+  "label.my-websites": "My websites",
   "label.name": "Імя",
   "label.new-password": "Новы пароль",
   "label.none": "Няма",
-  "label.operating-systems": "Аперацыонныя сістэмы",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Уласнік",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Прагляды старонкі",
+  "label.pageTitle": "Page title",
   "label.pages": "Старонкі",
   "label.password": "Пароль",
   "label.powered-by": "Зроблена {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "У рэяльным часе",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Аднавіць",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Абавязкова",
   "label.reset": "Скінуць",
   "label.reset-website": "Скінуць статыстыку",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Захаваць",
@@ -99,12 +132,15 @@
   "label.settings": "Налады",
   "label.share-url": "Падзяліцца спасылкай",
   "label.single-day": "Адзін дзень",
+  "label.sum": "Sum",
   "label.tablet": "Планшэт",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Тэма",
   "label.this-month": "Гэты месяц",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Сёння",
   "label.toggle-charts": "Пераключыць графікі",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Код адсочвання",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Унікальныя наведвальнікі",
   "label.unknown": "Невядома",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Імя карыстальніка",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Пабачыць дэталі",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Сайты",
   "label.window": "Window",
   "label.yesterday": "Учора",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} тякучых {x, plural, one {наведвальнік} other {наведвальнікаў}}",
   "message.confirm-delete": "Вы дакладна хочаце выдаліць {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Некарэктны username/password.",
   "message.invalid-domain": "Некарэктны дамен",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Няма дадзеных.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Паролі не супадаюць",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Вы не наладзілі ніводнага сайту.",
   "message.page-not-found": "Старонка не знойдзена.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Уся статыстыка для гэтага сайту будзе выдалена, але код адсочвання будзе працягваць працаваць.",
@@ -184,12 +204,8 @@
   "message.share-url": "Гэта публічная спасылка для {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Код адсочвання",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Наведвальнік з {country} праз {browser} на {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Вы не наладзілі ніводнага сайту.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Наведвальнік з {country} праз {browser} на {os} {device}"
 }
diff --git a/lang/bn-BD.json b/lang/bn-BD.json
index 01069f9230..483d100808 100644
--- a/lang/bn-BD.json
+++ b/lang/bn-BD.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "ওয়েবসাইট যুক্ত করুন",
   "label.admin": "অ্যাডমিন",
+  "label.after": "After",
   "label.all": "সবগুলো",
   "label.all-time": "সব সময়",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "গড় পরিদর্শনের সময়",
   "label.back": "পেছনে",
+  "label.before": "Before",
   "label.bounce-rate": "বহিষ্কারের হার",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "ব্রাউজার",
   "label.cancel": "বাতিল",
   "label.change-password": "পাসওয়ার্ড পরিবর্তন করুন",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "পাসওয়ার্ড নিশ্চিত করুন",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "দেশ",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "কাস্টম রেঞ্জ",
   "label.dashboard": "ড্যাশবোর্ড",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "তারিখের পরিসীমা",
+  "label.day": "Day",
   "label.default-date-range": "ডিফল্ট তারিখের পরিসীমা",
   "label.delete": "মুছে ফেলুন",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "ওয়েবসাইট মুছুন",
+  "label.description": "Description",
   "label.desktop": "ডেস্কটপ",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "ডিভাইস গুলো",
   "label.dismiss": "বাতিল",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "ডোমেইন",
   "label.dropoff": "Dropoff",
   "label.edit": "সম্পাদনা করুন",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "ঘটনা",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "সম্মিলিত",
   "label.filter-raw": "অপরিশোধিত",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "ভাষা",
@@ -61,17 +83,25 @@
   "label.last-hours": "শেষ {x} ঘন্টা",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "লগিন",
   "label.logout": "লগ আউট",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "মুঠোফোন",
   "label.more": "আরও",
+  "label.my-websites": "My websites",
   "label.name": "নাম",
   "label.new-password": "নতুন পাসওয়ার্ড",
   "label.none": "কিছুই না",
-  "label.operating-systems": "অপারেটিং সিস্টেম গুলো",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "মালিক",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "পৃষ্ঠা পরিদর্শন গুলো",
+  "label.pageTitle": "Page title",
   "label.pages": "পৃষ্ঠাগুলি",
   "label.password": "পাসওয়ার্ড",
   "label.powered-by": "{name} দ্বারা চালিত",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "সরাসরি",
+  "label.referrer": "Referrer",
   "label.referrers": "রেফারার্স",
   "label.refresh": "রিফ্রেশ",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "প্রয়োজনীয়",
   "label.reset": "রিসেট",
   "label.reset-website": "ওয়েবসাইট রিসেট করুন",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "সংরক্ষণ",
@@ -99,12 +132,15 @@
   "label.settings": "সেটিংস",
   "label.share-url": "ইউআরএল শেয়ার করুন",
   "label.single-day": "একদিন",
+  "label.sum": "Sum",
   "label.tablet": "ট্যাবলেট",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "থিম",
   "label.this-month": "এই মাস",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "আজ",
   "label.toggle-charts": "চার্ট পরিবর্তন করুন",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "ট্র্যাকিং কোড",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "অনন্য ভিজিটর",
   "label.unknown": "অজানা",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "ব্যবহারকারীর নাম",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "বিস্তারিত দেখুন",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "সবগুলো ওয়েবসাইট",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} বর্তমান  {x, plural, one {visitor} other {visitors}}",
   "message.confirm-delete": "আপনি কি নিশ্চিত যে আপনি {target} মুছতে চান?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "ভুল ব্যবহারকারীর নাম/পাসওয়ার্ড।",
   "message.invalid-domain": "ভুল ডোমেন",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "কোন তথ্য নেই।",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "পাসওয়ার্ড মেলে না",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "কোনও ওয়েবসাইট কনফিগার করা নেই।",
   "message.page-not-found": "পৃষ্ঠা খুঁজে পাওয়া যায়নি।",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "এই ওয়েবসাইটের সমস্ত পরিসংখ্যান মুছে ফেলা হবে, তবে আপনার ট্র্যাকিং কোডটি অক্ষত থাকবে।",
@@ -184,12 +204,8 @@
   "message.share-url": "এটি {target} এর জন্য প্রকাশ্যে শেয়ার করার ইউআরএল।",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "ট্র্যাকিং কোড",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{country} থেকে একজন ভিসিটর {ব্রাউজার}, ব্যবহার করছেন {os} {device} এর মধ্যে।",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "কোনও ওয়েবসাইট কনফিগার করা নেই।",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{country} থেকে একজন ভিসিটর {ব্রাউজার}, ব্যবহার করছেন {os} {device} এর মধ্যে।"
 }
diff --git a/lang/ca-ES.json b/lang/ca-ES.json
index e5ca7ac893..51aee79dd5 100644
--- a/lang/ca-ES.json
+++ b/lang/ca-ES.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Afegeix lloc web",
   "label.admin": "Administrador",
+  "label.after": "After",
   "label.all": "Tots",
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Temps mitjà de visita",
   "label.back": "Enrere",
+  "label.before": "Before",
   "label.bounce-rate": "Percentatge de rebot",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Navegadors",
   "label.cancel": "Cancel·la",
   "label.change-password": "Canvia la contrasenya",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirma la contrasenya",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Països",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Rang personalitzat",
   "label.dashboard": "Panell",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Interval de dates",
+  "label.day": "Day",
   "label.default-date-range": "Interval de dates per defecte",
   "label.delete": "Esborra",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Esborra el lloc web",
+  "label.description": "Description",
   "label.desktop": "Escriptori",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Dispositius",
   "label.dismiss": "Descarta",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domini",
   "label.dropoff": "Dropoff",
   "label.edit": "Edita",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Esdeveniments",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Combinat",
   "label.filter-raw": "En cru",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Últimes {x} hores",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Connecta't",
   "label.logout": "Desconnecta't",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mòbil",
   "label.more": "Més",
+  "label.my-websites": "My websites",
   "label.name": "Nom",
   "label.new-password": "Contrasenya nova",
   "label.none": "None",
-  "label.operating-systems": "Sistemes operatius",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Propietari",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Pàgines vistes",
+  "label.pageTitle": "Page title",
   "label.pages": "Pàgines",
   "label.password": "Contrasenya",
   "label.powered-by": "Funciona amb {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Temps real",
+  "label.referrer": "Referrer",
   "label.referrers": "Referents",
   "label.refresh": "Refresca",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Obligatori",
   "label.reset": "Restableix",
   "label.reset-website": "Restableix estadístiques",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Desa",
@@ -99,12 +132,15 @@
   "label.settings": "Configuració",
   "label.share-url": "Enllaç per compartir",
   "label.single-day": "Un sol dia",
+  "label.sum": "Sum",
   "label.tablet": "Tauleta",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Aquest mes",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Avui",
   "label.toggle-charts": "Mostra/amaga gràfics",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Codi de seguiment",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visitants únics",
   "label.unknown": "Desconegut",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nom d'usuari",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Veure els detalls",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Llocs web",
   "label.window": "Window",
   "label.yesterday": "Ahir",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {visitant actual} other {visitants actuals}}",
   "message.confirm-delete": "Segur que vols esborrar {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Nom d'usuari o contrasenya incorrectes.",
   "message.invalid-domain": "Domini invàlid",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "No hi ha dades disponibles.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Les contrasenyes no coincideixen",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "No hi ha cap lloc web configurat.",
   "message.page-not-found": "No s'ha trobat la pàgina.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "S'esborraran totes les estadístiques per aquest lloc web, però el codi de seguiment es mantindrà.",
@@ -184,12 +204,8 @@
   "message.share-url": "Aquest és l'enllaç públic per compartir de {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Codi de seguiment",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitant de {country} usant {browser} a {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "No hi ha cap lloc web configurat.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitant de {country} usant {browser} a {os} {device}"
 }
diff --git a/lang/cs-CZ.json b/lang/cs-CZ.json
index 6330045045..548ee817d8 100644
--- a/lang/cs-CZ.json
+++ b/lang/cs-CZ.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Přidat web",
   "label.admin": "Administrátor",
+  "label.after": "After",
   "label.all": "Vše",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Průměrný čas návštěvy",
   "label.back": "Zpět",
+  "label.before": "Before",
   "label.bounce-rate": "Okamžité opuštění",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Prohlížeč",
   "label.cancel": "Zrušit",
   "label.change-password": "Změnit heslo",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Potvrdit heslo",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Země",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Vlastní rozsah",
   "label.dashboard": "Přehled",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Období",
+  "label.day": "Day",
   "label.default-date-range": "Výchozí období",
   "label.delete": "Smazat",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Smazat web",
+  "label.description": "Description",
   "label.desktop": "Stolní počítač",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Zařízení",
   "label.dismiss": "Odejít",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Doména",
   "label.dropoff": "Dropoff",
   "label.edit": "Upravit",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Události",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Kombinace",
   "label.filter-raw": "Nezpracované",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Posledních {x} hodin",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Přihlásit",
   "label.logout": "Odhlásit",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobilní telefon",
   "label.more": "Více",
+  "label.my-websites": "My websites",
   "label.name": "Jméno",
   "label.new-password": "Nové heslo",
   "label.none": "None",
-  "label.operating-systems": "Operační systém",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Zobrazení stránek",
+  "label.pageTitle": "Page title",
   "label.pages": "Stránky",
   "label.password": "Heslo",
   "label.powered-by": "Běží na {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Aktuálně",
+  "label.referrer": "Referrer",
   "label.referrers": "Odkazy",
   "label.refresh": "Obnovit",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Vyžadováno",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Uložit",
@@ -99,12 +132,15 @@
   "label.settings": "Nastavení",
   "label.share-url": "Sdílet URL",
   "label.single-day": "Jeden den",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Tento měsíc",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Dnes",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Sledovací kód",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Jedinečné návštěvy",
   "label.unknown": "Neznámý",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Uživatelské jméno",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Zobrazit detaily",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Weby",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} aktuálně {x, plural, one {návštěvník} other {návštěvníci}}",
   "message.confirm-delete": "Opravdu smazat {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Nesprávné jméno/heslo.",
   "message.invalid-domain": "Neplatná doména",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Žádná data.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Hesla se neschodují",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Nemáte nastavený žádný web.",
   "message.page-not-found": "Stránka nenalezena.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "Toto je sdílené URL pro {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Sledovací kód",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Návštěvník z {country} s prohlížečem {browser} na {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Nemáte nastavený žádný web.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Návštěvník z {country} s prohlížečem {browser} na {os} {device}"
 }
diff --git a/lang/da-DK.json b/lang/da-DK.json
index cd2a1126c0..9d4fe50ee8 100644
--- a/lang/da-DK.json
+++ b/lang/da-DK.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Tilføj hjemmeside",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Alle",
   "label.all-time": "Altid",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Gennemsnitlig besøgstid",
   "label.back": "Tilbage",
+  "label.before": "Before",
   "label.bounce-rate": "Afvisningsprocent",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsere",
   "label.cancel": "Afvis",
   "label.change-password": "Skift adgangskode",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Godkendt adgangskode",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Lande",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Tilpasset interval",
   "label.dashboard": "Betjeningspanel",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Datointerval",
+  "label.day": "Day",
   "label.default-date-range": "Standard datointerval",
   "label.delete": "Slet",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Slet hjemmeside",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Enheder",
   "label.dismiss": "Afvis",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domæne",
   "label.dropoff": "Dropoff",
   "label.edit": "Rediger",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Hændelser",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Kombineret",
   "label.filter-raw": "Rå",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Sprog",
@@ -61,17 +83,25 @@
   "label.last-hours": "Sidste {x} timer",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Log ind",
   "label.logout": "Log ud",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobil",
   "label.more": "Mere",
+  "label.my-websites": "My websites",
   "label.name": "Navn",
   "label.new-password": "Ny adgangskode",
   "label.none": "None",
-  "label.operating-systems": "Operativsystemer",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Ejer",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Sidevisninger",
+  "label.pageTitle": "Page title",
   "label.pages": "Sider",
   "label.password": "Adgangskode",
   "label.powered-by": "Drevet af {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtid",
+  "label.referrer": "Referrer",
   "label.referrers": "Henvisninger",
   "label.refresh": "Opdater",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Påkrævet",
   "label.reset": "Nulstil",
   "label.reset-website": "Nulstil statistikker",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Gem",
@@ -99,12 +132,15 @@
   "label.settings": "Indstillinger",
   "label.share-url": "Del URL",
   "label.single-day": "Enkelt dag",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Denne måned",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Idag",
   "label.toggle-charts": "Ændre graf",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Sporingskode",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unikke besøgende",
   "label.unknown": "Ukendt",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Brugernavn",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Vis detajler",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Hjemmesider",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} nuværende {x, plural, one {bruger} other {brugere}}",
   "message.confirm-delete": "Er du sikker på at du vil slette {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Ugyldigt brugernavn/adgangskode.",
   "message.invalid-domain": "Ugyldigt domæne",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Ingen data tilgængelig.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Adgangskoderne matcher ikke",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Du har ikke konfigureret nogen hjemmesider.",
   "message.page-not-found": "Side ikke fundet.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Alle statistikker for denne hjemmeside ville blive slettet, men sporingskode ville forblive intakt.",
@@ -184,12 +204,8 @@
   "message.share-url": "Dette er den offentlige delings-URL til {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Sporingskode",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Besøgende fra {country} bruger {browser} på {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Du har ikke konfigureret nogen hjemmesider.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Besøgende fra {country} bruger {browser} på {os} {device}"
 }
diff --git a/lang/de-CH.json b/lang/de-CH.json
index 7ea503b0ac..5c6c45d14a 100644
--- a/lang/de-CH.json
+++ b/lang/de-CH.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Websiite hinzuefüege",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Alli",
   "label.all-time": "Gesamte Zitruum",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Durchschn. Bsuechsziit",
   "label.back": "Zrugg",
+  "label.before": "Before",
   "label.bounce-rate": "Absprungsrate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browser",
   "label.cancel": "Abbreche",
   "label.change-password": "Passwort ändere",
   "label.cities": "Städt",
+  "label.city": "City",
   "label.clear-all": "Alles lösche",
   "label.confirm": "Bestätige",
   "label.confirm-password": "Passwort widerhole",
+  "label.contains": "Contains",
   "label.continue": "Wiiter",
   "label.countries": "Länder",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Team erstelle",
   "label.create-user": "Benutzer erstelle",
   "label.created": "Erstellt",
@@ -28,16 +37,21 @@
   "label.custom-range": "Benutzerdefinierte Bereich",
   "label.dashboard": "Übersicht",
   "label.data": "Datä",
+  "label.date": "Date",
   "label.date-range": "Datumsbereich",
+  "label.day": "Day",
   "label.default-date-range": "Vorigstellte Datumsbereich",
   "label.delete": "Lösche",
   "label.delete-team": "Team lösche",
   "label.delete-user": "Benutzer lösche",
   "label.delete-website": "Websiite lösche",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Grät",
   "label.dismiss": "Verwerfe",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Bearbeite",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Ereigniss",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Kombiniert",
   "label.filter-raw": "Rohdate",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Biträte",
   "label.join-team": "Team biträte",
   "label.language": "Sprach",
@@ -61,17 +83,25 @@
   "label.last-hours": "Letzti {x} Stunde",
   "label.leave": "Verlah",
   "label.leave-team": "Team verlah",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Aamelde",
   "label.logout": "Abmelde",
+  "label.max": "Max",
   "label.members": "Mitglieder",
+  "label.min": "Min",
   "label.mobile": "Handy",
   "label.more": "Meh",
+  "label.my-websites": "My websites",
   "label.name": "Name",
   "label.new-password": "Neus Passwort",
   "label.none": "Keis",
-  "label.operating-systems": "Betriibssystem",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Bsitzer",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Siitenufrüef",
+  "label.pageTitle": "Page title",
   "label.pages": "Siite",
   "label.password": "Passwort",
   "label.powered-by": "Betribe dur {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Abfragparameter",
   "label.realtime": "Echtzit",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrer",
   "label.refresh": "Aktualisiere",
   "label.regenerate": "Erneuere",
+  "label.region": "Region",
   "label.regions": "Regionä",
   "label.remove": "Entferne",
   "label.reports": "Reports",
   "label.required": "Erforderlich",
   "label.reset": "Zruggsetze",
   "label.reset-website": "Statistik zruggsetze",
+  "label.retention": "Retention",
   "label.role": "Rollä",
   "label.run-query": "Run query",
   "label.save": "Speichere",
@@ -99,12 +132,15 @@
   "label.settings": "Istellige",
   "label.share-url": "Freigab-URL",
   "label.single-day": "Ein Tag",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team Gast",
   "label.team-id": "Team ID",
   "label.team-member": "Team Mitglied",
+  "label.team-name": "Team name",
   "label.team-owner": "Team Bsitzer",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Thema",
   "label.this-month": "De Monet",
@@ -114,14 +150,21 @@
   "label.title": "Titel",
   "label.today": "Hüt",
   "label.toggle-charts": "Schaubilder umschalte",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Tracking Code",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Eidütigi Bsuecher",
   "label.unknown": "Unbekannt",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Benutzer",
   "label.username": "Benutzername",
   "label.users": "Benutzer",
+  "label.value": "Value",
   "label.view": "Azeige",
   "label.view-details": "Details azeige",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Websiite",
   "label.window": "Window",
   "label.yesterday": "Gester",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {aktive Bsuecher} other {aktivi Bsuecher}}",
   "message.confirm-delete": "Sind Sie sich sicher, {target} zlösche?",
   "message.confirm-leave": "Sind Sie sich sicher, {target} zverlah?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Falschs Passwort oder Benutzername.",
   "message.invalid-domain": "Ungültigi Domain",
   "message.min-password-length": "Miminamli längi vo {n} Zeiche",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Kei Date vorhande.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwörter stimmed ned überi",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "Dem Team sind kei Websiite zuegordnet.",
   "message.no-teams": "Bisher sind no kei Teams erstellt worde.",
   "message.no-users": "Da gits kei Benutzer",
+  "message.no-websites-configured": "Es isch kei Websiite vorhande.",
   "message.page-not-found": "Siite ned gfunde.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Alli Date für die Websiite werdet glöscht, nur de Tracking Code blibt bestah.",
@@ -184,12 +204,8 @@
   "message.share-url": "Ihri Websiitestatistik isch under de folgende URL öffentlich zuegänglich:",
   "message.team-already-member": "Sie sind bereits es Mitglied vo dem Team.",
   "message.team-not-found": "Team nöd gfunde.",
+  "message.team-websites-info": "Websiite chönd vo jedem im Team agluegt werde",
   "message.tracking-code": "Tracking Code",
   "message.user-deleted": "Benutzer glöscht.",
-  "message.visitor-log": "Bsuecher us {country} benutzt {browser} uf {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "Dem Team sind kei Websiite zuegordnet.",
-  "message.no-websites-configured": "Es isch kei Websiite vorhande.",
-  "message.team-websites-info": "Websiite chönd vo jedem im Team agluegt werde",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Bsuecher us {country} benutzt {browser} uf {os} {device}"
 }
diff --git a/lang/de-DE.json b/lang/de-DE.json
index b09f47ab27..3307dfa406 100644
--- a/lang/de-DE.json
+++ b/lang/de-DE.json
@@ -6,21 +6,30 @@
   "label.add-description": "Beschreibung hinzufügen",
   "label.add-website": "Webseite hinzufügen",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Alle",
   "label.all-time": "Gesamter Zeitraum",
   "label.analytics": "Analytics",
+  "label.average": "Durchschnitt",
   "label.average-visit-time": "Durchschn. Besuchszeit",
   "label.back": "Zurück",
+  "label.before": "Before",
   "label.bounce-rate": "Absprungrate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browser",
   "label.cancel": "Abbrechen",
   "label.change-password": "Passwort ändern",
   "label.cities": "Städte",
+  "label.city": "City",
   "label.clear-all": "Alles löschen",
   "label.confirm": "Bestätigen",
   "label.confirm-password": "Passwort wiederholen",
+  "label.contains": "Contains",
   "label.continue": "Weiter",
   "label.countries": "Länder",
+  "label.country": "Country",
+  "label.create-report": "Report erstellen",
   "label.create-team": "Team erstellen",
   "label.create-user": "Benutzer erstellen",
   "label.created": "Erstellt",
@@ -28,16 +37,21 @@
   "label.custom-range": "Benutzerdefinierter Bereich",
   "label.dashboard": "Übersicht",
   "label.data": "Daten",
+  "label.date": "Date",
   "label.date-range": "Datumsbereich",
+  "label.day": "Day",
   "label.default-date-range": "Voreingestellter Datumsbereich",
   "label.delete": "Löschen",
   "label.delete-team": "Team löschen",
   "label.delete-user": "Benutzer löschen",
   "label.delete-website": "Webseite löschen",
+  "label.description": "Beschreibung",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Geräte",
   "label.dismiss": "Verwerfen",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Bearbeiten",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event daten",
   "label.events": "Ereignisse",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Kombiniert",
   "label.filter-raw": "Rohdaten",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Größer als",
+  "label.greater-than-equals": "Größer oder gleich",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Beitreten",
   "label.join-team": "Team beitreten",
   "label.language": "Sprache",
@@ -61,17 +83,25 @@
   "label.last-hours": "Letzte {x} Stunden",
   "label.leave": "Verlassen",
   "label.leave-team": "Team verlassen",
+  "label.less-than": "Kleiner als",
+  "label.less-than-equals": "Kleiner oder gleich",
   "label.login": "Anmelden",
   "label.logout": "Abmelden",
+  "label.max": "Max",
   "label.members": "Mitglieder",
+  "label.min": "Min",
   "label.mobile": "Handy",
   "label.more": "Mehr",
+  "label.my-websites": "My websites",
   "label.name": "Name",
   "label.new-password": "Neues Passwort",
   "label.none": "Keine",
-  "label.operating-systems": "Betriebssysteme",
+  "label.os": "OS",
+  "label.overview": "Übersicht",
   "label.owner": "Besitzer",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Seitenaufrufe",
+  "label.pageTitle": "Page title",
   "label.pages": "Seiten",
   "label.password": "Passwort",
   "label.powered-by": "Betrieben durch {name}",
@@ -80,15 +110,18 @@
   "label.query": "Abfrage",
   "label.query-parameters": "Abfrageparameter",
   "label.realtime": "Echtzeit",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrer",
   "label.refresh": "Aktualisieren",
   "label.regenerate": "Erneuern",
+  "label.region": "Region",
   "label.regions": "Regionen",
   "label.remove": "Entfernen",
   "label.reports": "Reporte",
   "label.required": "Erforderlich",
   "label.reset": "Zurücksetzen",
   "label.reset-website": "Statistik zurücksetzen",
+  "label.retention": "Retention",
   "label.role": "Rolle",
   "label.run-query": "Abfrage starten",
   "label.save": "Speichern",
@@ -99,12 +132,15 @@
   "label.settings": "Einstellungen",
   "label.share-url": "Freigabe-URL",
   "label.single-day": "Ein Tag",
+  "label.sum": "Summe",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team Gast",
   "label.team-id": "Team ID",
   "label.team-member": "Team Mitglied",
+  "label.team-name": "Team name",
   "label.team-owner": "Team Eigentümer",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Thema",
   "label.this-month": "Diesen Monat",
@@ -114,14 +150,21 @@
   "label.title": "Titel",
   "label.today": "Heute",
   "label.toggle-charts": "Schaubilder umschalten",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Tracking Code",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Eindeutige Besucher",
   "label.unknown": "Unbekannt",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Benutzer",
   "label.username": "Benutzername",
   "label.users": "Benutzer",
+  "label.value": "Value",
   "label.view": "Anzeigen",
   "label.view-details": "Details anzeigen",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Webseiten",
   "label.window": "Window",
   "label.yesterday": "Gestern",
-  "labels.after": "After",
-  "labels.average": "Durchschnitt",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Report erstellen",
-  "labels.description": "Beschreibung",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Größer als",
-  "labels.greater-than-equals": "Größer oder gleich",
-  "labels.less-than": "Kleiner als",
-  "labels.less-than-equals": "Kleiner oder gleich",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Übersicht",
-  "labels.sum": "Summe",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {aktiver Besucher} other {aktive Besucher}}",
   "message.confirm-delete": "Sind Sie sich sicher, {target} zu löschen?",
   "message.confirm-leave": "Sind Sie sicher, dass die {target} verlassen möchten?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Falsches Passwort oder Benutzername.",
   "message.invalid-domain": "Ungültige Domain",
   "message.min-password-length": "Minimale länge von {n} Zeichen",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Keine Daten vorhanden.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwörter stimmen nicht überein",
+  "message.no-results-found": "Keine Ergebnisse gefunden.",
+  "message.no-team-websites": "Diesem Team sind keine Websites zugeordnet.",
   "message.no-teams": "Bisher wurden keine Teams erstellt.",
   "message.no-users": "Hier gibt es keine Benutzer.",
+  "message.no-websites-configured": "Es ist keine Webseite vorhanden.",
   "message.page-not-found": "Seite nicht gefunden.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Alle Daten für diese Webseite werden gelöscht, jedoch bleibt der Tracking Code bestehen.",
@@ -184,12 +204,8 @@
   "message.share-url": "Ihre Webseitenstatistik ist unter der folgenden URL öffentlich zugänglich:",
   "message.team-already-member": "Sie sind bereits Mitglied des Teams.",
   "message.team-not-found": "Team nicht gefunden.",
+  "message.team-websites-info": "Webseiten können von jedem im Team eingesehen werden.",
   "message.tracking-code": "Tracking Code",
   "message.user-deleted": "Benutzer gelöscht.",
-  "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}",
-  "message.no-results-found": "Keine Ergebnisse gefunden.",
-  "message.no-team-websites": "Diesem Team sind keine Websites zugeordnet.",
-  "message.no-websites-configured": "Es ist keine Webseite vorhanden.",
-  "message.team-websites-info": "Webseiten können von jedem im Team eingesehen werden.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Besucher aus {country} benutzt {browser} auf {os} {device}"
 }
diff --git a/lang/el-GR.json b/lang/el-GR.json
index 6d7b1bb4ee..dd95c77723 100644
--- a/lang/el-GR.json
+++ b/lang/el-GR.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Προσθήκη ιστότοπου",
   "label.admin": "Διαχειριστής",
+  "label.after": "After",
   "label.all": "All",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Μέσος χρόνος επίσκεψης",
   "label.back": "Πίσω",
+  "label.before": "Before",
   "label.bounce-rate": "Ποσοστό αναπήδησης",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Προγράμματα περιήγησης",
   "label.cancel": "Ακύρωση",
   "label.change-password": "Αλλαγή κωδικού",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Επιβεβαίωση κωδικού",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Χώρες",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Προσαρμοσμένο εύρος",
   "label.dashboard": "Πίνακας",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Εύρος ημερομηνιών",
+  "label.day": "Day",
   "label.default-date-range": "Προεπιλεγμένο εύρος ημερομηνιών",
   "label.delete": "Διαγραφή",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Διαγραφή ιστότοπου",
+  "label.description": "Description",
   "label.desktop": "Σταθερός υπολογιστής",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Συσκευές",
   "label.dismiss": "Dismiss",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Τομέας",
   "label.dropoff": "Dropoff",
   "label.edit": "Επεξεργασία",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Γεγονότα",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Σε συνδυασμό",
   "label.filter-raw": "Ακατέργαστο",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Τελευταίες {x} ώρες",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Είσοδος",
   "label.logout": "Αποσύνδεση",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Κινητό",
   "label.more": "Περισσότερα",
+  "label.my-websites": "My websites",
   "label.name": "Όνομα",
   "label.new-password": "Νέος κωδικός",
   "label.none": "None",
-  "label.operating-systems": "Λειτουργικά συστήματα",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Προβολές σελίδας",
+  "label.pageTitle": "Page title",
   "label.pages": "Σελίδες",
   "label.password": "Κωδικός",
   "label.powered-by": "Με την υποστήριξη του {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
+  "label.referrer": "Referrer",
   "label.referrers": "Παραπομπές",
   "label.refresh": "Ανανέωση",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Απαιτείται",
   "label.reset": "Επαναφορά",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Αποθήκευση",
@@ -99,12 +132,15 @@
   "label.settings": "Ρυθμίσεις",
   "label.share-url": "Κοινοποίηση διεύθυνσης URL",
   "label.single-day": "Ημερήσια",
+  "label.sum": "Sum",
   "label.tablet": "Τάμπλετ",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Αυτο το μήνα",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Σήμερα",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Κωδικός παρακολούθησης",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Μοναδικοί επισκέπτες",
   "label.unknown": "Άγνωστο",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Όνομα χρήστη",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Λεπτομέρειες",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Ιστότοποι",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} ενεργοί {x, plural, one {επισκέπτης} other {επισκέπτες}}",
   "message.confirm-delete": "Είστε βέβαιοι ότι θέλετε να διαγράψετε το {target};",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Εσφαλμένο όνομα χρήστη / κωδικός πρόσβασης.",
   "message.invalid-domain": "Μη έγκυρος τομέας",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Δεν υπάρχουν διαθέσιμα δεδομένα.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Οι κωδικοί πρόσβασης δεν ταιριάζουν",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Δεν έχετε ρυθμίσει κανένα ιστότοπο.",
   "message.page-not-found": "Η σελίδα δεν βρέθηκε.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "Αυτό είναι το κοινόχρηστο URL για το {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Κωδικός παρακολούθησης",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Δεν έχετε ρυθμίσει κανένα ιστότοπο.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/en-GB.json b/lang/en-GB.json
index 33a9e640ed..4efaec5dfc 100644
--- a/lang/en-GB.json
+++ b/lang/en-GB.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Add website",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "All",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Average visit time",
   "label.back": "Back",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "Cancel",
   "label.change-password": "Change password",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirm password",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Countries",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Custom range",
   "label.dashboard": "Dashboard",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Date range",
+  "label.day": "Day",
   "label.default-date-range": "Default date range",
   "label.delete": "Delete",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Delete website",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Devices",
   "label.dismiss": "Dismiss",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Edit",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Events",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Last {x} hours",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Login",
   "label.logout": "Logout",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobile",
   "label.more": "More",
+  "label.my-websites": "My websites",
   "label.name": "Name",
   "label.new-password": "New password",
   "label.none": "None",
-  "label.operating-systems": "Operating systems",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Page views",
+  "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Refresh",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Required",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Save",
@@ -99,12 +132,15 @@
   "label.settings": "Settings",
   "label.share-url": "Share URL",
   "label.single-day": "Single day",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "This month",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Today",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Tracking code",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "Unknown",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Username",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "View details",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
   "message.confirm-delete": "Are you sure you want to delete {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Incorrect username/password.",
   "message.invalid-domain": "Invalid domain",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "No data available.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwords don't match",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "You don't have any websites configured.",
   "message.page-not-found": "Page not found.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "This is the publicly shared URL for {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Tracking code",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "You don't have any websites configured.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/en-US.json b/lang/en-US.json
index b4daac897c..b7c77a694c 100644
--- a/lang/en-US.json
+++ b/lang/en-US.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Add website",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "All",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Average visit time",
   "label.back": "Back",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "Cancel",
   "label.change-password": "Change password",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirm password",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Countries",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Custom range",
   "label.dashboard": "Dashboard",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Date range",
+  "label.day": "Day",
   "label.default-date-range": "Default date range",
   "label.delete": "Delete",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Delete website",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Devices",
   "label.dismiss": "Dismiss",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Edit",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Events",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Last {x} hours",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Login",
   "label.logout": "Logout",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobile",
   "label.more": "More",
+  "label.my-websites": "My websites",
   "label.name": "Name",
   "label.new-password": "New password",
   "label.none": "None",
-  "label.operating-systems": "Operating systems",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Page views",
+  "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Refresh",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Required",
   "label.reset": "Reset",
   "label.reset-website": "Reset website",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Save",
@@ -99,12 +132,15 @@
   "label.settings": "Settings",
   "label.share-url": "Share URL",
   "label.single-day": "Single day",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "This month",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Today",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Tracking code",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "Unknown",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Username",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "View details",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} current {x, plural, one {visitor} other {visitors}}",
   "message.confirm-delete": "Are you sure you want to delete {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Incorrect username and/or password.",
   "message.invalid-domain": "Invalid domain. Do not include http/https.",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "No data available.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwords do not match.",
+  "message.no-results-found": "No results found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "You do not have any websites configured.",
   "message.page-not-found": "Page not found",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your settings will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "Your website stats are publically available at the following URL:",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "You do not have any websites configured.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/es-ES.json b/lang/es-ES.json
index 55343af1da..7a401e51d9 100644
--- a/lang/es-ES.json
+++ b/lang/es-ES.json
@@ -6,21 +6,30 @@
   "label.add-description": "Añadir descripción",
   "label.add-website": "Nuevo sitio web",
   "label.admin": "Administrador",
+  "label.after": "Después",
   "label.all": "Todos",
   "label.all-time": "Todos los tiempos",
   "label.analytics": "Analíticas",
+  "label.average": "Media",
   "label.average-visit-time": "Tiempo promedio de visita",
   "label.back": "Atrás",
+  "label.before": "Antes",
   "label.bounce-rate": "Porcentaje de rebote",
+  "label.breakdown": "Desglose",
+  "label.browser": "Browser",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
   "label.change-password": "Cambiar contraseña",
   "label.cities": "Ciudades",
+  "label.city": "City",
   "label.clear-all": "Limpiar todo",
   "label.confirm": "Confirmar",
   "label.confirm-password": "Confirmar contraseña",
+  "label.contains": "Contiene",
   "label.continue": "Continuar",
   "label.countries": "Países",
+  "label.country": "Country",
+  "label.create-report": "Crear reporte",
   "label.create-team": "Crear equipo",
   "label.create-user": "Crear usuario",
   "label.created": "Creado",
@@ -28,16 +37,21 @@
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Panel de control",
   "label.data": "Datos",
+  "label.date": "Date",
   "label.date-range": "Intervalo de fechas",
+  "label.day": "Day",
   "label.default-date-range": "Intervalo por defecto",
   "label.delete": "Eliminar",
   "label.delete-team": "Eliminar equipo",
   "label.delete-user": "Eliminar usuario",
   "label.delete-website": "Eliminar sitio",
+  "label.description": "Descripciones",
   "label.desktop": "Escritorio",
   "label.details": "Detalles",
+  "label.device": "Device",
   "label.devices": "Dispositivos",
   "label.dismiss": "Ignorar",
+  "label.does-not-contain": "No contiene",
   "label.domain": "Dominio",
   "label.dropoff": "Dropoff",
   "label.edit": "Editar",
@@ -46,12 +60,20 @@
   "label.event": "Evento",
   "label.event-data": "Datos de evento",
   "label.events": "Eventos",
+  "label.false": "False",
   "label.field": "Campo",
   "label.fields": "Campos",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "En crudo",
+  "label.filters": "Filtros",
   "label.funnel": "Funnel",
+  "label.greater-than": "Mayor que",
+  "label.greater-than-equals": "Mayor que o igual a",
   "label.insights": "Insights",
+  "label.is": "Es igual a",
+  "label.is-not": "No es igual a",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Unir",
   "label.join-team": "Unirse al equipo",
   "label.language": "Idioma",
@@ -61,17 +83,25 @@
   "label.last-hours": "Últimas {x} horas",
   "label.leave": "Abandonar",
   "label.leave-team": "Abandonar equipo",
+  "label.less-than": "Menor que",
+  "label.less-than-equals": "Menor que o igual a",
   "label.login": "Iniciar sesión",
   "label.logout": "Cerrar sesión",
+  "label.max": "Máx",
   "label.members": "Miembros",
+  "label.min": "Mín",
   "label.mobile": "Móvil",
   "label.more": "Más",
+  "label.my-websites": "My websites",
   "label.name": "Nombre",
   "label.new-password": "Nueva contraseña",
   "label.none": "Ninguno",
-  "label.operating-systems": "Sistemas operativos",
+  "label.os": "OS",
+  "label.overview": "Resumen",
   "label.owner": "Propietario",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Vistas",
+  "label.pageTitle": "Page title",
   "label.pages": "Páginas",
   "label.password": "Contraseña",
   "label.powered-by": "Con la ayuda de {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Parámetros de petición",
   "label.realtime": "Tiempo real",
+  "label.referrer": "Referrer",
   "label.referrers": "Referido desde",
   "label.refresh": "Actualizar",
   "label.regenerate": "Regenerar",
+  "label.region": "Region",
   "label.regions": "Regiones",
   "label.remove": "Quitar",
   "label.reports": "Reportes",
   "label.required": "Obligatorio",
   "label.reset": "Reiniciar",
   "label.reset-website": "Reiniciar estadísticas",
+  "label.retention": "Retention",
   "label.role": "Rol",
   "label.run-query": "Ejecutar consulta",
   "label.save": "Guardar",
@@ -99,12 +132,15 @@
   "label.settings": "Configuraciones",
   "label.share-url": "Compartir URL",
   "label.single-day": "Un solo día",
+  "label.sum": "Suma",
   "label.tablet": "Tableta",
   "label.team": "Equipo",
   "label.team-guest": "Invitado al equipo",
   "label.team-id": "ID de equipo",
   "label.team-member": "Miembro del equipo",
+  "label.team-name": "Team name",
   "label.team-owner": "Admin. del equipo",
+  "label.team-websites": "Team websites",
   "label.teams": "Equipos",
   "label.theme": "Tema",
   "label.this-month": "Este mes",
@@ -114,14 +150,21 @@
   "label.title": "Título",
   "label.today": "Hoy",
   "label.toggle-charts": "Alternar gráficas",
+  "label.total": "Total",
+  "label.total-records": "Total de registros",
   "label.tracking-code": "Código de rastreo",
+  "label.true": "Verdadero",
+  "label.type": "Tipo",
+  "label.unique": "Único",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconocida",
+  "label.untitled": "Sin título",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuario",
   "label.username": "Nombre de usuario",
   "label.users": "Usuarios",
+  "label.value": "Valor",
   "label.view": "Visualizar",
   "label.view-details": "Ver detalles",
   "label.view-only": "Ver sólo",
@@ -132,33 +175,6 @@
   "label.websites": "Sitios web",
   "label.window": "Ventana",
   "label.yesterday": "Ayer",
-  "labels.after": "Después",
-  "labels.average": "Media",
-  "labels.before": "Antes",
-  "labels.breakdown": "Desglose",
-  "labels.contains": "Contiene",
-  "labels.create-report": "Crear reporte",
-  "labels.description": "Descripciones",
-  "labels.does-not-contain": "No contiene",
-  "labels.does-not-equal": "No es igual a",
-  "labels.equals": "Es igual a",
-  "labels.false": "False",
-  "labels.filters": "Filtros",
-  "labels.greater-than": "Mayor que",
-  "labels.greater-than-equals": "Mayor que o igual a",
-  "labels.less-than": "Menor que",
-  "labels.less-than-equals": "Menor que o igual a",
-  "labels.max": "Máx",
-  "labels.min": "Mín",
-  "labels.overview": "Resumen",
-  "labels.sum": "Suma",
-  "labels.total": "Total",
-  "labels.total-records": "Total de registros",
-  "labels.true": "Verdadero",
-  "labels.type": "Tipo",
-  "labels.unique": "Único",
-  "labels.untitled": "Sin título",
-  "labels.value": "Valor",
   "message.active-users": "{x} {x, plural, one {activo} other {activos}}",
   "message.confirm-delete": "¿Seguro que quieres eliminar {target}?",
   "message.confirm-leave": "¿Seguro que quieres abandonar {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Nombre de usuario o contraseña incorrectos.",
   "message.invalid-domain": "Dominio inválido",
   "message.min-password-length": "Longitud mínima de {n} caracteres",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "No hay información disponible.",
   "message.no-event-data": "No hay datos de eventos disponibles.",
   "message.no-match-password": "Las contraseñas no coinciden",
+  "message.no-results-found": "No se encontraron resultados.",
+  "message.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
   "message.no-teams": "No has creado ningún equipo.",
   "message.no-users": "No hay usuarios.",
+  "message.no-websites-configured": "No tienes ningún sitio web configurado.",
   "message.page-not-found": "Página no encontrada",
   "message.reset-website": "Para reiniciar este sitio web, escribe {confirmation} a continuación para confirmar.",
   "message.reset-website-warning": "Todas las estadísticas de esta página serán eliminadas, pero el código de rastreo permanecerá intacto.",
@@ -184,12 +204,8 @@
   "message.share-url": "Esta es la URL pública para {target}.",
   "message.team-already-member": "Ya eres miembro de este equipo.",
   "message.team-not-found": "Equipo no encontrado.",
+  "message.team-websites-info": "Las analíticas de tus sitios web pueden ser vistas por cualquier miembro del equipo.",
   "message.tracking-code": "Código de rastreo",
   "message.user-deleted": "Usuario eliminado.",
-  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}",
-  "message.no-results-found": "No se encontraron resultados.",
-  "message.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
-  "message.no-websites-configured": "No tienes ningún sitio web configurado.",
-  "message.team-websites-info": "Las analíticas de tus sitios web pueden ser vistas por cualquier miembro del equipo.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}"
 }
diff --git a/lang/es-MX.json b/lang/es-MX.json
index dd6a3cce60..499b2533f9 100644
--- a/lang/es-MX.json
+++ b/lang/es-MX.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Nuevo sitio web",
   "label.admin": "Administrador",
+  "label.after": "After",
   "label.all": "Todos",
   "label.all-time": "Todos los tiempos",
   "label.analytics": "Analíticas",
+  "label.average": "Average",
   "label.average-visit-time": "Tiempo promedio de visita",
   "label.back": "Atrás",
+  "label.before": "Before",
   "label.bounce-rate": "Porcentaje de rebote",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
   "label.change-password": "Cambiar contraseña",
   "label.cities": "Ciudades",
+  "label.city": "City",
   "label.clear-all": "Limpiar todo",
   "label.confirm": "Confirmar",
   "label.confirm-password": "Confirmar contraseña",
+  "label.contains": "Contains",
   "label.continue": "Continuar",
   "label.countries": "Países",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Crear equipo",
   "label.create-user": "Crear usuario",
   "label.created": "Creado",
@@ -28,16 +37,21 @@
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Panel de control",
   "label.data": "Datos",
+  "label.date": "Date",
   "label.date-range": "Intervalo de fechas",
+  "label.day": "Day",
   "label.default-date-range": "Intervalo por defecto",
   "label.delete": "Eliminar",
   "label.delete-team": "Eliminar team",
   "label.delete-user": "Eliminar usuario",
   "label.delete-website": "Eliminar sitio",
+  "label.description": "Description",
   "label.desktop": "Escritorio",
   "label.details": "Detalles",
+  "label.device": "Device",
   "label.devices": "Dispositivos",
   "label.dismiss": "Ignorar",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Dominio",
   "label.dropoff": "Dropoff",
   "label.edit": "Editar",
@@ -46,12 +60,20 @@
   "label.event": "Evento",
   "label.event-data": "Event data",
   "label.events": "Eventos",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Personalizado",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Unir",
   "label.join-team": "Unir a equipo",
   "label.language": "Idioma",
@@ -61,17 +83,25 @@
   "label.last-hours": "Últimas {x} horas",
   "label.leave": "Abandonar",
   "label.leave-team": "Abandonar equipo",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Iniciar sesión",
   "label.logout": "Cerrar sesión",
+  "label.max": "Max",
   "label.members": "Miembros",
+  "label.min": "Min",
   "label.mobile": "Móvil",
   "label.more": "Más",
+  "label.my-websites": "My websites",
   "label.name": "Nombre",
   "label.new-password": "Nueva contraseña",
   "label.none": "Ninguno",
-  "label.operating-systems": "Sistemas operativos",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Propietario",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Vistas",
+  "label.pageTitle": "Page title",
   "label.pages": "Páginas",
   "label.password": "Contraseña",
   "label.powered-by": "Analíticas de {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Parámetros de petición",
   "label.realtime": "Tiempo real",
+  "label.referrer": "Referrer",
   "label.referrers": "Referido desde",
   "label.refresh": "Actualizar",
   "label.regenerate": "Regenerar",
+  "label.region": "Region",
   "label.regions": "Regiones",
   "label.remove": "Quitar",
   "label.reports": "Reports",
   "label.required": "Obligatorio",
   "label.reset": "Reiniciar",
   "label.reset-website": "Reiniciar estadísticas",
+  "label.retention": "Retention",
   "label.role": "Rol",
   "label.run-query": "Run query",
   "label.save": "Guardar",
@@ -99,12 +132,15 @@
   "label.settings": "Configuraciones",
   "label.share-url": "Compartir URL",
   "label.single-day": "Día",
+  "label.sum": "Sum",
   "label.tablet": "Tableta",
   "label.team": "Equipo",
   "label.team-guest": "Invitado de equipo",
   "label.team-id": "ID de equipo",
   "label.team-member": "Miembro de equipo",
+  "label.team-name": "Team name",
   "label.team-owner": "Admin. del equipo",
+  "label.team-websites": "Team websites",
   "label.teams": "Equipos",
   "label.theme": "Tema",
   "label.this-month": "Este mes",
@@ -114,14 +150,21 @@
   "label.title": "Título",
   "label.today": "Hoy",
   "label.toggle-charts": "Alternar gráficas",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Código de rastreo",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconocida",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuario",
   "label.username": "Nombre de usuario",
   "label.users": "Usuarios",
+  "label.value": "Value",
   "label.view": "Visualizar",
   "label.view-details": "Ver detalles",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Sitios",
   "label.window": "Window",
   "label.yesterday": "Ayer",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {activo} other {activos}}",
   "message.confirm-delete": "¿Seguro que quieres eliminar {target}?",
   "message.confirm-leave": "¿Seguro que quieres abandonar {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Nombre de usuario o contraseña incorrectos.",
   "message.invalid-domain": "Dominio inválido",
   "message.min-password-length": "Longitud mínima de {n} caracteres",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "No hay información disponible.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Las contraseñas no coinciden",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
   "message.no-teams": "No has creado ningún equipo.",
   "message.no-users": "No hay usuarios.",
+  "message.no-websites-configured": "No tienes ningún sitio configurado.",
   "message.page-not-found": "Página no encontrada",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Todas las estadísticas de esta página serán eliminadas, pero el código de rastreo permanecerá intacto.",
@@ -184,12 +204,8 @@
   "message.share-url": "Esta es la URL compartida públicamente para {target}.",
   "message.team-already-member": "Ya eres miembro de este equipo.",
   "message.team-not-found": "Equipo no encontrado.",
+  "message.team-websites-info": "Las analíticas de tus sitios pueden verse por cualquier miembro del equipo.",
   "message.tracking-code": "Código de rastreo",
   "message.user-deleted": "Usuario eliminado.",
-  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "Este equipo no tiene ningún sitio web configurado.",
-  "message.no-websites-configured": "No tienes ningún sitio configurado.",
-  "message.team-websites-info": "Las analíticas de tus sitios pueden verse por cualquier miembro del equipo.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}"
 }
diff --git a/lang/fa-IR.json b/lang/fa-IR.json
index a81792ae0e..b263a7d1a8 100644
--- a/lang/fa-IR.json
+++ b/lang/fa-IR.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "افزودن وب‌سایت",
   "label.admin": "مدیر",
+  "label.after": "After",
   "label.all": "همه",
   "label.all-time": "همه زمان",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "میانگین زمان بازدید",
   "label.back": "برگشت",
+  "label.before": "Before",
   "label.bounce-rate": "نرخ Bounce",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "مروگرها",
   "label.cancel": "انصراف",
   "label.change-password": "تغییر رمز",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "تایید رمز",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "کشورها",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "محدوده‌ی دلخواه",
   "label.dashboard": "داشبورد",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "محدوده‌ی تاریخ",
+  "label.day": "Day",
   "label.default-date-range": "محدوده‌ی پیشفرض تاریخ",
   "label.delete": "حذف",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "حذف وب‌سایت",
+  "label.description": "Description",
   "label.desktop": "دسکتاپ",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "دستگاه‌ها",
   "label.dismiss": "رد کردن",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "دامنه",
   "label.dropoff": "Dropoff",
   "label.edit": "ویرایش",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "رویدادها",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "ترکیب شده",
   "label.filter-raw": "خام",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "زبان",
@@ -61,17 +83,25 @@
   "label.last-hours": "لیست {x} ساعت گذشته",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "ورود",
   "label.logout": "خروج",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "موبایل",
   "label.more": "بیشتر",
+  "label.my-websites": "My websites",
   "label.name": "نام",
   "label.new-password": "رمز جدید",
   "label.none": "None",
-  "label.operating-systems": "سیستم‌عامل‌ها",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "ایجاد شده توسط",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "بازدید صفحه",
+  "label.pageTitle": "Page title",
   "label.pages": "صفحه‌ها",
   "label.password": "رمز",
   "label.powered-by": "قدرت گرفته توسط {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "آمار زنده",
+  "label.referrer": "Referrer",
   "label.referrers": "ارجاع دهندگان",
   "label.refresh": "به‌روزرسانی",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "ضروری",
   "label.reset": "بازنشانی",
   "label.reset-website": "بازنشانی آمار",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "ذخیره",
@@ -99,12 +132,15 @@
   "label.settings": "تنظیمات",
   "label.share-url": "به اشتراک گذاری URL",
   "label.single-day": "یک روز",
+  "label.sum": "Sum",
   "label.tablet": "تبلت",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "تم",
   "label.this-month": "این ماه",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "امروز",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "کد رهگیری",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "بازدیدکننده‌های یکتا",
   "label.unknown": "ناشناخته",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "نام کاربری",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "مشاهده‌ی جزئیات",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "وب‌سایت‌ها",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} هم اکنون {x, plural, one {یک} other {از میان}}",
   "message.confirm-delete": "آیا مطمئن هستید می‌خواهید {target} را حذف کنید?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "نام کاربری / رمز نادرست است.",
   "message.invalid-domain": "دامنه‌ی نامعتبر",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "اطلاعاتی موجود نیست.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "رمزها یکسان نیستند",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "شما هیچ وب‌سایتی را پیکربندی نکرده‌اید.",
   "message.page-not-found": "صفحه یافت نشد.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "تمامی آمارهای این وب‌سایت حذف خواهد شد اما tracking code بدون تغییر باقی می‌ماند.",
@@ -184,12 +204,8 @@
   "message.share-url": "این URL به اشتراک گذاشته شده عمومی برای {target} است.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "کد رهگیری",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "بازدیدکننده از کشور {country} با مروگر {browser} در {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "شما هیچ وب‌سایتی را پیکربندی نکرده‌اید.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "بازدیدکننده از کشور {country} با مروگر {browser} در {os} {device}"
 }
diff --git a/lang/fi-FI.json b/lang/fi-FI.json
index 541d391ad1..9e9c1de033 100644
--- a/lang/fi-FI.json
+++ b/lang/fi-FI.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Lisää verkkosivu",
   "label.admin": "Järjestelmänvalvoja",
+  "label.after": "After",
   "label.all": "Kaikki",
   "label.all-time": "Alusta lähtien",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Keskimääräinen vierailuaika",
   "label.back": "Takaisin",
+  "label.before": "Before",
   "label.bounce-rate": "Välitön poistuminen",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Selaimet",
   "label.cancel": "Peruuta",
   "label.change-password": "Vaihda salasana",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Vahvista salasana",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Maat",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Mukautettu ajanjakso",
   "label.dashboard": "Ohjauspaneeli",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Ajanjakso",
+  "label.day": "Day",
   "label.default-date-range": "Oletusajanjakso",
   "label.delete": "Poista",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Poista verkkosivu",
+  "label.description": "Description",
   "label.desktop": "Pöytäkone",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Laitteet",
   "label.dismiss": "Hylkää",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Verkkotunnus",
   "label.dropoff": "Dropoff",
   "label.edit": "Muokkaa",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Tapahtumat",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Yhdistetty",
   "label.filter-raw": "Käsittelemätön",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Kieli",
@@ -61,17 +83,25 @@
   "label.last-hours": "Viimeisimmät {x} tuntia",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Kirjaudu sisään",
   "label.logout": "Kirjaudu ulos",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Puhelin",
   "label.more": "Lisää",
+  "label.my-websites": "My websites",
   "label.name": "Nimi",
   "label.new-password": "Uusi salasana",
   "label.none": "None",
-  "label.operating-systems": "Käyttöjärjestelmät",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Omistaja",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Sivun näyttökerrat",
+  "label.pageTitle": "Page title",
   "label.pages": "Sivut",
   "label.password": "Salasana",
   "label.powered-by": "Voimanlähteenä {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Juuri nyt",
+  "label.referrer": "Referrer",
   "label.referrers": "Viittaajat",
   "label.refresh": "Päivitä",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Vaaditaan",
   "label.reset": "Nollaa",
   "label.reset-website": "Nollaa tilastot",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Tallenna",
@@ -99,12 +132,15 @@
   "label.settings": "Asetukset",
   "label.share-url": "Jaa URL",
   "label.single-day": "Yksi päivä",
+  "label.sum": "Sum",
   "label.tablet": "Tabletti",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Teema",
   "label.this-month": "Tämä kuukausi",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Tänään",
   "label.toggle-charts": "Kytke kaaviot päälle/pois",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Seurantakoodi",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Yksittäiset kävijät",
   "label.unknown": "Tuntematon",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Käyttäjänimi",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Katso tiedot",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Verkkosivut",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {vierailija} other {vierailijaa}}",
   "message.confirm-delete": "Haluatko varmasti poistaa sivuston {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Väärä käyttäjänimi/salasana.",
   "message.invalid-domain": "Virheellinen verkkotunnus",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Tietoja ei ole käytettävissä.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Salasanat eivät täsmää",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Sinulla ei ole määritettyjä verkkosivustoja.",
   "message.page-not-found": "Sivua ei löydetty.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Kaikki sivuston tilastot poistetaan, mutta seurantakoodi pysyy muuttumattomana.",
@@ -184,12 +204,8 @@
   "message.share-url": "Tämä on julkisesti jaettu URL sivustolle {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Seurantakoodi",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Vierailija maasta {country} selaimella {browser} laitteella {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Sinulla ei ole määritettyjä verkkosivustoja.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Vierailija maasta {country} selaimella {browser} laitteella {os} {device}"
 }
diff --git a/lang/fo-FO.json b/lang/fo-FO.json
index e31c94d9d8..6259a5557e 100644
--- a/lang/fo-FO.json
+++ b/lang/fo-FO.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Legg heimasíðu afturat",
   "label.admin": "Fyrisitari",
+  "label.after": "After",
   "label.all": "Alt",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Miðal vitjurnartíð ",
   "label.back": "Aftur",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce prosenttal",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Kagar",
   "label.cancel": "Strika",
   "label.change-password": "Skift loyniorð",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Vátta loyniorð",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Lond",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Tillaga  spenni",
   "label.dashboard": "Yvirlitsskíggi",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Vel dato",
+  "label.day": "Day",
   "label.default-date-range": "Forsett dato",
   "label.delete": "Sletta",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Sletta heimasíðu",
+  "label.description": "Description",
   "label.desktop": "Borðtelda",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Tóleindir",
   "label.dismiss": "Lat fara",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Økisnavn",
   "label.dropoff": "Dropoff",
   "label.edit": "Ger broyting",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Hendingar/tiltøk",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Samansett",
   "label.filter-raw": "Óviðgjørt",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Seinastu {x} tímarnar",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Rita inn",
   "label.logout": "Rita út",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Telefon",
   "label.more": "Meira",
+  "label.my-websites": "My websites",
   "label.name": "Navn",
   "label.new-password": "Nýtt loyniorð",
   "label.none": "None",
-  "label.operating-systems": "Stýrikervir",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Opnaðar síðir",
+  "label.pageTitle": "Page title",
   "label.pages": "Síðir",
   "label.password": "Loyniorð",
   "label.powered-by": "Powered by {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Beinleiðis",
+  "label.referrer": "Referrer",
   "label.referrers": "Framsendingar",
   "label.refresh": "Endurskapa",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Kravt",
   "label.reset": "Nulstilla",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Goym",
@@ -99,12 +132,15 @@
   "label.settings": "Stillingar",
   "label.share-url": "Deil leinku",
   "label.single-day": "Einkultur dagur",
+  "label.sum": "Sum",
   "label.tablet": "Teldil",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Hendan mánan",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Í dag",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Spori kota",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Einsýna vitjanir",
   "label.unknown": "Ókent",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Brúkaranavn",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Vís frágreiðing",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Heimasíður",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} í løtuni {x, plural, one {vitjandi} other { vitjandi }}",
   "message.confirm-delete": "Ert tú sikkur at tú ynskir at strika {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Skeivt brúkaranavn/loyniorð.",
   "message.invalid-domain": "Ógilt økisnavn",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Einki data tøk.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Loyniorðini eru ikki eins",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Tú hevur ongar heimasíður stillaða til.",
   "message.page-not-found": "Síðan bleiv ikki funnin.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "Hettar er tann almenna leinkan av {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Spori kota",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Vitjandi frá {country} brúkar {browser} á {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Tú hevur ongar heimasíður stillaða til.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Vitjandi frá {country} brúkar {browser} á {os} {device}"
 }
diff --git a/lang/fr-FR.json b/lang/fr-FR.json
index d1e6691a07..558c1cd26b 100644
--- a/lang/fr-FR.json
+++ b/lang/fr-FR.json
@@ -6,21 +6,30 @@
   "label.add-description": "Ajouter une description",
   "label.add-website": "Ajouter un site",
   "label.admin": "Administrateur",
+  "label.after": "Après",
   "label.all": "Tout",
   "label.all-time": "Toutes les données",
   "label.analytics": "Analytics",
+  "label.average": "Moyenne",
   "label.average-visit-time": "Temps de visite moyen",
   "label.back": "Retour",
+  "label.before": "Avant",
   "label.bounce-rate": "Taux de rebond",
+  "label.breakdown": "Répartition",
+  "label.browser": "Browser",
   "label.browsers": "Navigateurs",
   "label.cancel": "Annuler",
   "label.change-password": "Changer le mot de passe",
   "label.cities": "Villes",
+  "label.city": "City",
   "label.clear-all": "Réinitialiser",
   "label.confirm": "Confirmer",
   "label.confirm-password": "Confirmation du mot de passe",
+  "label.contains": "Contient",
   "label.continue": "Continuer",
   "label.countries": "Pays",
+  "label.country": "Country",
+  "label.create-report": "Créer un rapport",
   "label.create-team": "Créer une équipe",
   "label.create-user": "Créer un utilisateur",
   "label.created": "Créé",
@@ -28,16 +37,21 @@
   "label.custom-range": "Période personnalisée",
   "label.dashboard": "Tableau de bord",
   "label.data": "Données",
+  "label.date": "Date",
   "label.date-range": "Période",
+  "label.day": "Day",
   "label.default-date-range": "Période par défaut",
   "label.delete": "Supprimer",
   "label.delete-team": "Supprimer l'équipe",
   "label.delete-user": "Supprimer l'utilisateur",
   "label.delete-website": "Supprimer le site",
+  "label.description": "Description",
   "label.desktop": "Ordinateur",
   "label.details": "Détails",
+  "label.device": "Device",
   "label.devices": "Appareils",
   "label.dismiss": "Ignorer",
+  "label.does-not-contain": "Ne contient pas",
   "label.domain": "Domaine",
   "label.dropoff": "Dropoff",
   "label.edit": "Modifier",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Données d'événements",
   "label.events": "Événements",
+  "label.false": "Faux",
   "label.field": "Champ",
   "label.fields": "Champs",
   "label.filter-combined": "Combiné",
   "label.filter-raw": "Brut",
+  "label.filters": "Filtres",
   "label.funnel": "Entonnoir",
+  "label.greater-than": "Supérieur à",
+  "label.greater-than-equals": "Supérieur ou égal à",
   "label.insights": "Insights",
+  "label.is": "Est égal",
+  "label.is-not": "N'est pas égal",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Rejoindre",
   "label.join-team": "Rejoindre une équipe",
   "label.language": "Langue",
@@ -61,17 +83,25 @@
   "label.last-hours": "{x} dernières heures",
   "label.leave": "Quitter",
   "label.leave-team": "Quitter l'équipe",
+  "label.less-than": "Inférieur à",
+  "label.less-than-equals": "Inférieur ou égal à",
   "label.login": "Connexion",
   "label.logout": "Déconnexion",
+  "label.max": "Max",
   "label.members": "Membres",
+  "label.min": "Min",
   "label.mobile": "Téléphone",
   "label.more": "Plus",
+  "label.my-websites": "My websites",
   "label.name": "Nom",
   "label.new-password": "Nouveau mot de passe",
   "label.none": "Aucun·e",
-  "label.operating-systems": "Systèmes d'exploitation",
+  "label.os": "OS",
+  "label.overview": "Vue d'ensemble",
   "label.owner": "Propriétaire",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Pages vues",
+  "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Mot de passe",
   "label.powered-by": "Propulsé par {name}",
@@ -80,15 +110,18 @@
   "label.query": "Requête",
   "label.query-parameters": "Paramètres d'URL",
   "label.realtime": "Temps réel",
+  "label.referrer": "Referrer",
   "label.referrers": "Sites référents",
   "label.refresh": "Rafraîchir",
   "label.regenerate": "Régénérer",
+  "label.region": "Region",
   "label.regions": "Régions",
   "label.remove": "Retirer",
   "label.reports": "Rapports",
   "label.required": "Requis",
   "label.reset": "Réinitialiser",
   "label.reset-website": "Réinitialiser les statistiques",
+  "label.retention": "Retention",
   "label.role": "Rôle",
   "label.run-query": "Éxécuter la requête",
   "label.save": "Enregistrer",
@@ -99,12 +132,15 @@
   "label.settings": "Paramètres",
   "label.share-url": "URL de partage",
   "label.single-day": "Journée",
+  "label.sum": "Somme",
   "label.tablet": "Tablette",
   "label.team": "Équipe",
   "label.team-guest": "Invité dans l'équipe",
   "label.team-id": "ID d'équipe",
   "label.team-member": "Membre de l'équipe",
+  "label.team-name": "Team name",
   "label.team-owner": "Propriétaire de l'équipe",
+  "label.team-websites": "Team websites",
   "label.teams": "Équipes",
   "label.theme": "Thème",
   "label.this-month": "Ce mois",
@@ -114,14 +150,21 @@
   "label.title": "Titre",
   "label.today": "Aujourd'hui",
   "label.toggle-charts": "Afficher/Masquer les graphiques",
+  "label.total": "Total",
+  "label.total-records": "Nombre d'enregistrements",
   "label.tracking-code": "Code de suivi",
+  "label.true": "Vrai",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visiteurs uniques",
   "label.unknown": "Inconnu",
+  "label.untitled": "Sans titre",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Utilisateur",
   "label.username": "Nom d'utilisateur",
   "label.users": "Utilisateurs",
+  "label.value": "Valeur",
   "label.view": "Voir",
   "label.view-details": "Voir les détails",
   "label.view-only": "Consultation",
@@ -132,33 +175,6 @@
   "label.websites": "Sites",
   "label.window": "Fenêtre",
   "label.yesterday": "Hier",
-  "labels.after": "Après",
-  "labels.average": "Moyenne",
-  "labels.before": "Avant",
-  "labels.breakdown": "Répartition",
-  "labels.contains": "Contient",
-  "labels.create-report": "Créer un rapport",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Ne contient pas",
-  "labels.does-not-equal": "N'est pas égal",
-  "labels.equals": "Est égal",
-  "labels.false": "Faux",
-  "labels.filters": "Filtres",
-  "labels.greater-than": "Supérieur à",
-  "labels.greater-than-equals": "Supérieur ou égal à",
-  "labels.less-than": "Inférieur à",
-  "labels.less-than-equals": "Inférieur ou égal à",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Vue d'ensemble",
-  "labels.sum": "Somme",
-  "labels.total": "Total",
-  "labels.total-records": "Nombre d'enregistrements",
-  "labels.true": "Vrai",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Sans titre",
-  "labels.value": "Valeur",
   "message.active-users": "{x} {x, plural, one {visiteur} other {visiteurs}} actuellement",
   "message.confirm-delete": "Êtes-vous sûr de vouloir supprimer {target} ?",
   "message.confirm-leave": "Êtes-vous sûr de vouloir quitter {target} ?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Nom d'utilisateur/Mot de passe incorrect.",
   "message.invalid-domain": "Domaine invalide",
   "message.min-password-length": "Taille minimale de {n} caractères",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Aucune donnée disponible.",
   "message.no-event-data": "Aucune donnée d'événement disponible.",
   "message.no-match-password": "Les mots de passe ne correspondent pas",
+  "message.no-results-found": "Aucun résultat n'a été trouvé.",
+  "message.no-team-websites": "Cette équipe n'a aucun site.",
   "message.no-teams": "Vous n'avez pas créé d'équipe.",
   "message.no-users": "Aucun utilisateur.",
+  "message.no-websites-configured": "Vous n'avez pas configuré de site.",
   "message.page-not-found": "Page non trouvée.",
   "message.reset-website": "Pour réinitialiser ce site, taper {confirmation} ci-dessous pour confirmer.",
   "message.reset-website-warning": "Toutes les statistiques pour ce site seront supprimées, mais votre code de suivi restera intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "Les statistiques de votre site sont accessibles publiquement sur cette URL :",
   "message.team-already-member": "Vous êtes déjà membre de cette équipe.",
   "message.team-not-found": "Équipe non trouvée.",
+  "message.team-websites-info": "Les sites peuvent être vus par tout utilisateur dans l'équipe.",
   "message.tracking-code": "Code de suivi",
   "message.user-deleted": "Utilisateur supprimé.",
-  "message.visitor-log": "Visiteur de {country} utilisant {browser} sur {os} {device}",
-  "message.no-results-found": "Aucun résultat n'a été trouvé.",
-  "message.no-team-websites": "Cette équipe n'a aucun site.",
-  "message.no-websites-configured": "Vous n'avez pas configuré de site.",
-  "message.team-websites-info": "Les sites peuvent être vus par tout utilisateur dans l'équipe.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visiteur de {country} utilisant {browser} sur {os} {device}"
 }
diff --git a/lang/ga-ES.json b/lang/ga-ES.json
index dce6504ccf..e6ceda8a91 100644
--- a/lang/ga-ES.json
+++ b/lang/ga-ES.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Engadir sitio web",
   "label.admin": "Administradora",
+  "label.after": "After",
   "label.all": "Todo",
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Tempo medio de visita",
   "label.back": "Atrás",
+  "label.before": "Before",
   "label.bounce-rate": "Proporción de rebote",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
   "label.change-password": "Mudar contrasinal",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirmar contrasinal",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Países",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Rango personalizado",
   "label.dashboard": "Taboleiro",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Rango temporal",
+  "label.day": "Day",
   "label.default-date-range": "Rango temporal por defecto",
   "label.delete": "Eliminar",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Eliminar sitio web",
+  "label.description": "Description",
   "label.desktop": "Escritorio",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Dispositivos",
   "label.dismiss": "Desbotar",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Dominio",
   "label.dropoff": "Dropoff",
   "label.edit": "Editar",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Eventos",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Idioma",
@@ -61,17 +83,25 @@
   "label.last-hours": "Últimas {x} horas",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Acceder",
   "label.logout": "Pechar sesión",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Móbil",
   "label.more": "Máis",
+  "label.my-websites": "My websites",
   "label.name": "Nome",
   "label.new-password": "Novo contrasinal",
   "label.none": "None",
-  "label.operating-systems": "Sistemas operativos",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Dona",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Vistas de páxinas",
+  "label.pageTitle": "Page title",
   "label.pages": "Páxinas",
   "label.password": "Contrasinal",
   "label.powered-by": "Funciona grazas a {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Agora mesmo",
+  "label.referrer": "Referrer",
   "label.referrers": "Orixes",
   "label.refresh": "Actualizar",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Requerido",
   "label.reset": "Restablecer",
   "label.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Gardar",
@@ -99,12 +132,15 @@
   "label.settings": "Axustes",
   "label.share-url": "Compartir URL",
   "label.single-day": "Un só día",
+  "label.sum": "Sum",
   "label.tablet": "Tableta",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Decorado",
   "label.this-month": "Este mes",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Hoxe",
   "label.toggle-charts": "Activación das gráficas",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Código de seguimento",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visitas únicas",
   "label.unknown": "Descoñecido",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Identificador",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Ver detalles",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Sitios web",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} actual {x, plural, one {visitante} other {visitantes}}",
   "message.confirm-delete": "Tes a certeza de querer eliminar {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Credenciais incorrectas.",
   "message.invalid-domain": "Dominio non válido",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Sen datos dispoñibles.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Non concordan os contrasinais",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Non tes sitios web configurados.",
   "message.page-not-found": "Páxina non atopada.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Vanse eliminar tódalas estatísticas deste sitio web, pero o código de seguimento permanecerá sen cambios.",
@@ -184,12 +204,8 @@
   "message.share-url": "Este é o URL da compartición pública de {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Código de seguimento",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Non tes sitios web configurados.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitante desde {country} usando {browser} en {os} {device}"
 }
diff --git a/lang/he-IL.json b/lang/he-IL.json
index 8ed7f6c02b..fd3e0b8b8f 100644
--- a/lang/he-IL.json
+++ b/lang/he-IL.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "הוספת אתר",
   "label.admin": "מנהל",
+  "label.after": "After",
   "label.all": "הכל",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "זמן ביקור ממוצע",
   "label.back": "חזרה",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "דפדפנים",
   "label.cancel": "ביטול",
   "label.change-password": "שינוי סיסמה",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "אישור סיסמה",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "מדינות",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "טווח מותאם",
   "label.dashboard": "דשבורד",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "טווח תאריכים",
+  "label.day": "Day",
   "label.default-date-range": "טווח תאריכים בברירת מחדל",
   "label.delete": "הסרה",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "הסרת אתר",
+  "label.description": "Description",
   "label.desktop": "דסקטופ",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "מכשירים",
   "label.dismiss": "שיחרור",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "דומיין",
   "label.dropoff": "Dropoff",
   "label.edit": "עריכה",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "אירועים",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "משותף",
   "label.filter-raw": "גולמי",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "{x} שעות אחרונות",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "התחברות",
   "label.logout": "התנתקות",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "מובייל",
   "label.more": "עוד",
+  "label.my-websites": "My websites",
   "label.name": "שם",
   "label.new-password": "סיסמה חדשה",
   "label.none": "None",
-  "label.operating-systems": "מערכות הפעלה",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "צפיות בדפים",
+  "label.pageTitle": "Page title",
   "label.pages": "דפים",
   "label.password": "סיסמה",
   "label.powered-by": "Powered by {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "זמן אמת",
+  "label.referrer": "Referrer",
   "label.referrers": "מפנים",
   "label.refresh": "רענון",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "נדרש",
   "label.reset": "איפוס",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "שמירה",
@@ -99,12 +132,15 @@
   "label.settings": "הגדרות",
   "label.share-url": "שיתוף URL",
   "label.single-day": "יום בודד",
+  "label.sum": "Sum",
   "label.tablet": "טאבלט",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "החודש",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "היום",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "קוד מעקב",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "מבקרים ייחודיים",
   "label.unknown": "לא ידוע",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "שם משתמש",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "פרטים נוספים",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "אתרים",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} נוכחיים {x, plural, one {מבקר} other {מבקרים}}",
   "message.confirm-delete": "האם באמת למחוק את {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "שם משתמש או סיסמה לא נכונים",
   "message.invalid-domain": "דומיין לא תקין",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "אין מידע זמין",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "סיסמאות לא תואמות",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "לא מוגדרים אתרים",
   "message.page-not-found": "דף לא נמצא",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "זהו URL ציבורי עבור {target}",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "קוד מעקב",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "מבקר ממדינת {country} משתמבש בדפדפן {browser} ב-{os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "לא מוגדרים אתרים",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "מבקר ממדינת {country} משתמבש בדפדפן {browser} ב-{os} {device}"
 }
diff --git a/lang/hi-IN.json b/lang/hi-IN.json
index 429e6ebb0e..6e268aa6e5 100644
--- a/lang/hi-IN.json
+++ b/lang/hi-IN.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "वेबसाइट",
   "label.admin": "प्रशासक",
+  "label.after": "After",
   "label.all": "सब",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "औसत दृश्य समय",
   "label.back": "पीछे",
+  "label.before": "Before",
   "label.bounce-rate": "उछाल दर",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "वेब ब्राउज़र",
   "label.cancel": "रद्द करें",
   "label.change-password": "पासवर्ड बदलें",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "पासवर्ड की पुष्टि कीजिये",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "देश",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "कस्टम रेंज",
   "label.dashboard": "नियंत्रण-पट्ट",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "तिथि सीमा",
+  "label.day": "Day",
   "label.default-date-range": "डिफ़ॉल्ट तिथि सीमा",
   "label.delete": "खाता हटाएं",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "वेबसाइट हटाएं",
+  "label.description": "Description",
   "label.desktop": "डेस्कटॉप",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "उपकरण",
   "label.dismiss": "खारिज कीजिये",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "डोमेन",
   "label.dropoff": "Dropoff",
   "label.edit": "संपादित करें",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "स्पर्धाएँ",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "संयुक्त",
   "label.filter-raw": "रॉ",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "पिछले {x} घंटे",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "लॉग इन",
   "label.logout": "लॉग आउट",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "मोबाइल फोन",
   "label.more": "और",
+  "label.my-websites": "My websites",
   "label.name": "नाम",
   "label.new-password": "नया पासवर्ड",
   "label.none": "None",
-  "label.operating-systems": "ऑपरेटिंग सिस्टम",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "पृष्ठ दृश्य",
+  "label.pageTitle": "Page title",
   "label.pages": "पृष्ठों",
   "label.password": "पासवर्ड",
   "label.powered-by": "{name} द्वारा संचालित",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "वास्तव काल",
+  "label.referrer": "Referrer",
   "label.referrers": "सन्दर्भदाता",
   "label.refresh": "रिफ्रेश",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "अपेक्षित",
   "label.reset": "रीसेट",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "सहेजें",
@@ -99,12 +132,15 @@
   "label.settings": "समायोजन",
   "label.share-url": "यूआरएल साझा करें",
   "label.single-day": "एक दिन",
+  "label.sum": "Sum",
   "label.tablet": "टैबलेट",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "इस महीने",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "आज",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "ट्रैकिंग कोड",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "अद्वितीय आगंतुकों",
   "label.unknown": "अज्ञात",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "उपयोगकर्ता नाम",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "विवरण देखें",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "वेबसाइटों",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} मौजूद {x, plural, one {आगंतुक} other {आगंतुकों}}",
   "message.confirm-delete": "क्या आप वाकई में {target} हटाना चाहते हैं?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "ग़लत उपयोगकर्ता नाम / पासवर्ड।",
   "message.invalid-domain": "अमान्य डोमेन",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "कोई डेटा उपलब्ध नहीं है।",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "पासवर्ड मेल नहीं खाते",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "आपके पास कोई वेबसाइट कॉन्फ़िगर नहीं है।",
   "message.page-not-found": "पृष्ठ नहीं मिला।",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "यह {target} के लिए सार्वजनिक रूप से साझा किया गया URL है।",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "ट्रैकिंग कोड",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{country} का आगंतुक, जो {browser} का उपयोग करता है, {os} यन्त्र पर",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "आपके पास कोई वेबसाइट कॉन्फ़िगर नहीं है।",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{country} का आगंतुक, जो {browser} का उपयोग करता है, {os} यन्त्र पर"
 }
diff --git a/lang/hr-HR.json b/lang/hr-HR.json
index a9deb51fc8..ecde7100e2 100644
--- a/lang/hr-HR.json
+++ b/lang/hr-HR.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Dodaj web stranicu",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Sve",
   "label.all-time": "Svo vrijeme",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Average visit time",
   "label.back": "Natrag ",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "Odustani",
   "label.change-password": "Promijeni lozinku",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Potvrdi lozinku",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Countries",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Prilagođeni raspon",
   "label.dashboard": "Nadzorna ploča",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Raspon datuma",
+  "label.day": "Day",
   "label.default-date-range": "Zadani datumski raspon",
   "label.delete": "Obriši",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Obriši web stranicu",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Devices",
   "label.dismiss": "Odbaci",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domena",
   "label.dropoff": "Dropoff",
   "label.edit": "Uredi",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Podaci događaja",
   "label.events": "Events",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Jezik",
@@ -61,17 +83,25 @@
   "label.last-hours": "Zadnjih {x} sati",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Prijava",
   "label.logout": "Odjava",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobile",
   "label.more": "Više",
+  "label.my-websites": "My websites",
   "label.name": "Ime",
   "label.new-password": "Nova lozinka",
   "label.none": "Ništa",
-  "label.operating-systems": "Operating systems",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Vlasnik",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Page views",
+  "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "Lozinka",
   "label.powered-by": "Powered by {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Stvarno vrijeme",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Osvježi",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Potrebna",
   "label.reset": "Resetirati",
   "label.reset-website": "Resetirati web stranicu",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Spremi",
@@ -99,12 +132,15 @@
   "label.settings": "Postavke",
   "label.share-url": "Podijeli poveznicu",
   "label.single-day": "Jedan dan",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Ovaj mjesec",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Danas",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Kod za praćenje",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "Nepoznato",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Korisničko ime",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Pogledaj detalje",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Web stranice",
   "label.window": "Window",
   "label.yesterday": "Jučer",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} Trenutno {x, plural, one {posjetitelj} other {posjetitelja}}",
   "message.confirm-delete": "Jeste li sigurni da želite obrisati {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Neispravno korisničke ime/lozinka.",
   "message.invalid-domain": "Invalid domain. Do not include http/https.",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Nema dostupnih podataka.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwords do not match.",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "You do not have any websites configured.",
   "message.page-not-found": "Stranica nije pronađena.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your settings will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "Ovo je javno dijeljena poveznica za {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "You do not have any websites configured.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/hu-HU.json b/lang/hu-HU.json
index e5c8a07805..0401afff74 100644
--- a/lang/hu-HU.json
+++ b/lang/hu-HU.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Weboldal hozzáadása",
   "label.admin": "Adminisztrátor",
+  "label.after": "After",
   "label.all": "Összes",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Átlagos látogatási idő",
   "label.back": "Vissza",
+  "label.before": "Before",
   "label.bounce-rate": "Visszafordulási arány",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Böngészők",
   "label.cancel": "Mégsem",
   "label.change-password": "Jelszó módosítása",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Jelszó megerősítése",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Országok",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Egyedi tartomány",
   "label.dashboard": "Áttekintés",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Időintervallum",
+  "label.day": "Day",
   "label.default-date-range": "Alapértelmezett időintervallum",
   "label.delete": "Eltávolítás",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Weboldal eltávolítása",
+  "label.description": "Description",
   "label.desktop": "Asztali számítógép",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Eszközök",
   "label.dismiss": "Mellőzés",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Módosítás",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Események",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Összevont",
   "label.filter-raw": "Nyers",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Legutóbbi {x} óra",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Bejelentkezés",
   "label.logout": "Kijelentkezés",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Telefon",
   "label.more": "Bővebben",
+  "label.my-websites": "My websites",
   "label.name": "Név",
   "label.new-password": "Új jelszó",
   "label.none": "None",
-  "label.operating-systems": "Operációs rendszerek",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Oldalmegtekintések",
+  "label.pageTitle": "Page title",
   "label.pages": "Oldalak",
   "label.password": "Jelszó",
   "label.powered-by": "Működteti az {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Valós idejű",
+  "label.referrer": "Referrer",
   "label.referrers": "Hivatkozók",
   "label.refresh": "Frissítés",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Kötelező",
   "label.reset": "Visszaállítás",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Mentés",
@@ -99,12 +132,15 @@
   "label.settings": "Beállítások",
   "label.share-url": "URL megosztása",
   "label.single-day": "Egy nap",
+  "label.sum": "Sum",
   "label.tablet": "Táblagép",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Ezen hónap",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Ma",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Követési kód",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Egyedi látogatók",
   "label.unknown": "Ismeretlen",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Felhasználónév",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Részletek",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Weboldalak",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {látogató} other {latógató}} jelenleg",
   "message.confirm-delete": "Biztos, hogy törölni szeretnéd {target} elemet?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Érvénytelen felhasználónév/jelszó.",
   "message.invalid-domain": "Érvénytelen domain",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Nincs rendelkezésre álló adat.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "A jelszavak nem egyeznek",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Még nem állítottál be egyetlen weboldalt sem.",
   "message.page-not-found": "Oldal nem található.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "{target} nyilvánosan megosztott URL címe.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Követési kód",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Látógató {country} területéről, {os} {device} eszközön, {browser} böngészőből.",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Még nem állítottál be egyetlen weboldalt sem.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Látógató {country} területéről, {os} {device} eszközön, {browser} böngészőből."
 }
diff --git a/lang/id-ID.json b/lang/id-ID.json
index 383f405efb..d0b8a0643b 100644
--- a/lang/id-ID.json
+++ b/lang/id-ID.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Tambah situs web",
   "label.admin": "Pengelola",
+  "label.after": "After",
   "label.all": "Semua",
   "label.all-time": "Semua waktu",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Waktu kunjungan rata-rata",
   "label.back": "Kembali",
+  "label.before": "Before",
   "label.bounce-rate": "Rasio pentalan",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Peramban",
   "label.cancel": "Batal",
   "label.change-password": "Ganti kata sandi",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Konfirmasi kata sandi",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Negara",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Rentang khusus",
   "label.dashboard": "Dasbor",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Rentang tanggal",
+  "label.day": "Day",
   "label.default-date-range": "Rentang tanggal bawaan",
   "label.delete": "Hapus",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Hapus situs web",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Perangkat",
   "label.dismiss": "Tutup",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Sunting",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Perihal",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Gabungan",
   "label.filter-raw": "Mentah",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Bahasa",
@@ -61,17 +83,25 @@
   "label.last-hours": "{x} jam terakhir",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Masuk",
   "label.logout": "Keluar",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Ponsel",
   "label.more": "Lebih banyak",
+  "label.my-websites": "My websites",
   "label.name": "Nama",
   "label.new-password": "Kata sandi baru",
   "label.none": "None",
-  "label.operating-systems": "Sistem Operasi",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Pemilik",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Tampilan halaman",
+  "label.pageTitle": "Page title",
   "label.pages": "Halaman",
   "label.password": "Kata sandi",
   "label.powered-by": "Didukung oleh {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Waktu nyata",
+  "label.referrer": "Referrer",
   "label.referrers": "Perujuk",
   "label.refresh": "Segarkan",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Wajib",
   "label.reset": "Atur ulang",
   "label.reset-website": "Atur ulang statistik",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Simpan",
@@ -99,12 +132,15 @@
   "label.settings": "Pengaturan",
   "label.share-url": "Bagikan URL",
   "label.single-day": "Sehari",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Bulan ini",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Hari ini",
   "label.toggle-charts": "Buka grafik",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Kode lacak",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Pengunjung unik",
   "label.unknown": "Tidak diketahui",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nama pengguna",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Lihat Detil",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Situs web",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} pengunjung saat ini",
   "message.confirm-delete": "Apakah kamu yakin ingin menghapus {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Nama pengguna/kata sandi salah.",
   "message.invalid-domain": "Domain tidak valid",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Tidak ada data.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Kata sandi tidak cocok",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Anda tidak memiliki situs web yang dikonfigurasi.",
   "message.page-not-found": "Halaman tidak ditemukan.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Semua statistik pada website ini akan dihapus, tetapi kode lacak akan tetap terpasang",
@@ -184,12 +204,8 @@
   "message.share-url": "Ini adalah URL yang dibagikan secara publik untuk {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Kode lacak",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Pengunjung dari {country} dengan {browser} di {device} {os}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Anda tidak memiliki situs web yang dikonfigurasi.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Pengunjung dari {country} dengan {browser} di {device} {os}"
 }
diff --git a/lang/it-IT.json b/lang/it-IT.json
index 854fd4528b..57d6d5ba3e 100644
--- a/lang/it-IT.json
+++ b/lang/it-IT.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Aggiungi sito",
   "label.admin": "Amministratore",
+  "label.after": "After",
   "label.all": "Tutto",
   "label.all-time": "Sempre",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Tempo medio di visita",
   "label.back": "Indietro",
+  "label.before": "Before",
   "label.bounce-rate": "Frequenza di rimbalzo",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browser",
   "label.cancel": "Annulla",
   "label.change-password": "Modifica password",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Conferma password",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Nazioni",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Personalizzato",
   "label.dashboard": "Pannello di Controllo",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Periodo",
+  "label.day": "Day",
   "label.default-date-range": "Periodo standard",
   "label.delete": "Elimina",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Elimina sito",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Dispositivi",
   "label.dismiss": "Scarta",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Dominio",
   "label.dropoff": "Dropoff",
   "label.edit": "Modifica",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Eventi",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Aggregati",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Lingua",
@@ -61,17 +83,25 @@
   "label.last-hours": "Ultime {x} ore",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Accedi",
   "label.logout": "Esci",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Cellulare",
   "label.more": "Dettagli",
+  "label.my-websites": "My websites",
   "label.name": "Nome",
   "label.new-password": "Nuova password",
   "label.none": "None",
-  "label.operating-systems": "Sistemi operativi",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Proprietario",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Visualizzazioni di pagina",
+  "label.pageTitle": "Page title",
   "label.pages": "Pagine",
   "label.password": "Password",
   "label.powered-by": "Powered by {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Tempo reale",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Ricarica",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Obbligatorio",
   "label.reset": "Reset",
   "label.reset-website": "Resetta le statistiche",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Salva",
@@ -99,12 +132,15 @@
   "label.settings": "Impostazioni",
   "label.share-url": "Condividi link",
   "label.single-day": "Singolo giorno",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Questo mese",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Oggi",
   "label.toggle-charts": "Apri/Chiudi i grafici",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Codice di tracking",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visitatori unici",
   "label.unknown": "Sconosciuto",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nome utente",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Vedi dettagli",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Siti web",
   "label.window": "Window",
   "label.yesterday": "Ieri",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {visitatore} other {visitatori}} online",
   "message.confirm-delete": "Sei sicuro di voler eliminare {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Username o password non corretti.",
   "message.invalid-domain": "Dominio non valido",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Nessun dato disponibile.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Le password non corrispondono",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Non hai ancora configurato alcun sito.",
   "message.page-not-found": "Pagina non trovata",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Tutte le statistiche verranno cancellate per questo sito, ma il tuo codice di tracciamento rimarrà invariato.",
@@ -184,12 +204,8 @@
   "message.share-url": "Questo è l'URL di condivisione per {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Codice di tracking",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Utenti da {country} tramite {browser} su {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Non hai ancora configurato alcun sito.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Utenti da {country} tramite {browser} su {os} {device}"
 }
diff --git a/lang/ja-JP.json b/lang/ja-JP.json
index 7f618a4e72..0f4d545043 100644
--- a/lang/ja-JP.json
+++ b/lang/ja-JP.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Webサイトの追加",
   "label.admin": "管理者",
+  "label.after": "After",
   "label.all": "すべて表示",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "平均滞在時間",
   "label.back": "戻る",
+  "label.before": "Before",
   "label.bounce-rate": "直帰率",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "ブラウザ",
   "label.cancel": "キャンセル",
   "label.change-password": "パスワード変更",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "パスワード（確認）",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "国",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "期間を指定する",
   "label.dashboard": "ダッシュボード",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "範囲指定",
+  "label.day": "Day",
   "label.default-date-range": "最初に表示する期間",
   "label.delete": "削除",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Webサイトの削除",
+  "label.description": "Description",
   "label.desktop": "デスクトップ",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "デバイス",
   "label.dismiss": "無視する",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "ドメイン",
   "label.dropoff": "Dropoff",
   "label.edit": "編集",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "イベント",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "パスまで",
   "label.filter-raw": "すべて表示",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "過去{x}時間",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "ログイン",
   "label.logout": "ログアウト",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "携帯電話",
   "label.more": "さらに表示",
+  "label.my-websites": "My websites",
   "label.name": "名前",
   "label.new-password": "新しいパスワード",
   "label.none": "None",
-  "label.operating-systems": "OS",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "閲覧数",
+  "label.pageTitle": "Page title",
   "label.pages": "ページ",
   "label.password": "パスワード",
   "label.powered-by": "このシステムは {name} で実行されています。",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "リアルタイム",
+  "label.referrer": "Referrer",
   "label.referrers": "リファラー",
   "label.refresh": "更新",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "必須",
   "label.reset": "リセット",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "保存",
@@ -99,12 +132,15 @@
   "label.settings": "設定",
   "label.share-url": "共有リンク",
   "label.single-day": "一日のみ",
+  "label.sum": "Sum",
   "label.tablet": "タブレット",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "今月",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "今日",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "トラッキングコード",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "ユニーク訪問者数",
   "label.unknown": "不明",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "ユーザー名",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "詳細を見る",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Webサイト",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x}人が閲覧中です。",
   "message.confirm-delete": "{target}を削除してもよろしいですか？",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "ユーザー名/パスワードが正しくありません。",
   "message.invalid-domain": "無効なドメイン",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "データがありません。",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "パスワードが一致しません",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Webサイトが設定されていません。",
   "message.page-not-found": "ページが見つかりません。",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "これは{target}の共有リンクです。",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "トラッキングコード",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{os}（{device}）で{browser}を使用している{country}からの訪問者",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Webサイトが設定されていません。",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{os}（{device}）で{browser}を使用している{country}からの訪問者"
 }
diff --git a/lang/km-KH.json b/lang/km-KH.json
index 2084424278..58f7926f32 100644
--- a/lang/km-KH.json
+++ b/lang/km-KH.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "បន្ថែមគេហទំព័រ",
   "label.admin": "អ្នកគ្រប់គ្រង",
+  "label.after": "After",
   "label.all": "ទាំងអស់",
   "label.all-time": "គ្រប់ពេល",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "មើលជាមធ្យម",
   "label.back": "ថយក្រោយ",
+  "label.before": "Before",
   "label.bounce-rate": "ចំនួនវិលត្រឡប់",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "កម្មវិធី",
   "label.cancel": "បោះបង់",
   "label.change-password": "ផ្លាស់ប្តូរពាក្យសម្ងាត់",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "បញ្ជាក់ពាក្យសម្ងាត់",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "ប្រទេស",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "កំណត់ដោយខ្លួនឯង",
   "label.dashboard": "ផ្ទាំងគ្រប់គ្រង",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "ចន្លោះកាលបរិច្ឆេទ",
+  "label.day": "Day",
   "label.default-date-range": "ចន្លោះកាលបរិច្ឆេទស្រាប់",
   "label.delete": "លុប",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "លុបគេហទំព័រ",
+  "label.description": "Description",
   "label.desktop": "កុំព្យូទ័រលើតុ",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "ឧបករណ៍",
   "label.dismiss": "បដិសេធ",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "ឈ្មោះគេហទំព័រ",
   "label.dropoff": "Dropoff",
   "label.edit": "កែប្រែ",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "ព្រឹត្តិការណ៍",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "រួមបញ្ចូលគ្នា",
   "label.filter-raw": "ដើម",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "ភាសា",
@@ -61,17 +83,25 @@
   "label.last-hours": "{x} ម៉ោងមុន",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Login",
   "label.logout": "ចេញ",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "ទូរស័ព្ទចល័ត",
   "label.more": "បន្ថែម",
+  "label.my-websites": "My websites",
   "label.name": "ឈ្មោះ",
   "label.new-password": "ពាក្យសម្ងាត់​ថ្មី",
   "label.none": "មិនមាន",
-  "label.operating-systems": "ប្រព័ន្ធប្រតិបត្តិការ",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "ម្ចាស់",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "អ្នកមើលទំព័រ",
+  "label.pageTitle": "Page title",
   "label.pages": "ទំព័រ",
   "label.password": "ពាក្យសម្ងាត់​",
   "label.powered-by": "ដំណើរការដោយ {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "ប៉ារ៉ាម៉ែត្រ Query",
   "label.realtime": "ឥលូវនេះ",
+  "label.referrer": "Referrer",
   "label.referrers": "អ្នកណែនាំ",
   "label.refresh": "ផ្ទុកឡើងវិញ",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "ទាមទារ",
   "label.reset": "កំណត់ឡើងវិញ",
   "label.reset-website": "កំណត់ស្ថិតិឡើងវិញ",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "រក្សាទុក",
@@ -99,12 +132,15 @@
   "label.settings": "ការកំណត់",
   "label.share-url": "ចែករំលែក URL",
   "label.single-day": "ថ្ងៃតែមួយ",
+  "label.sum": "Sum",
   "label.tablet": "ថេប្លេត",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "រូបរាង",
   "label.this-month": "ខែនេះ",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "ថ្ងៃនេះ",
   "label.toggle-charts": "បិទ/បើកតារាង",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "លេខកូដតាមដាន",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "អ្នកចូលមើលម្នាក់ៗ",
   "label.unknown": "មិនស្គាល់",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "ឈ្មោះ​អ្នកប្រើប្រាស់",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "មើលព័ត៌មានលម្អិត",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "គេហទំព័រ",
   "label.window": "Window",
   "label.yesterday": "ម្សិលមិញ",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "មានអ្នកមើល {x} នាក់ ឥលូវនេះ",
   "message.confirm-delete": "តើអ្នកប្រាកដថាចង់លុប {target} ទេ?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "ឈ្មោះអ្នកប្រើ/ពាក្យសម្ងាត់មិនត្រឹមត្រូវ។",
   "message.invalid-domain": "ឈ្មោះគេហទំព័រមិន​ត្រឹមត្រូវ",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "មិនមានទិន្នន័យទេ។",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "ពាក្យសម្ងាត់មិនត្រូវគ្នាទេ",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "អ្នកមិនទាន់បានដាក់គេហទំព័រណាមួយចូលទេ។",
   "message.page-not-found": "រកមិនឃើញទំព័រ។",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "ស្ថិតិទាំងអស់សម្រាប់គេហទំព័រនេះនឹងត្រូវបានលុប ប៉ុន្តែកូដតាមដានរបស់អ្នកនឹងនៅដដែល។",
@@ -184,12 +204,8 @@
   "message.share-url": "នេះគឺជា URL ដែលបានចែករំលែកជាសាធារណៈសម្រាប់ {target}។",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "លេខកូដតាមដាន",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "អ្នកមើលពីប្រទេស {country} ប្រើប្រាស់កម្មវិធី {browser} លើឧបករណ៍ {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "អ្នកមិនទាន់បានដាក់គេហទំព័រណាមួយចូលទេ។",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "អ្នកមើលពីប្រទេស {country} ប្រើប្រាស់កម្មវិធី {browser} លើឧបករណ៍ {os} {device}"
 }
diff --git a/lang/ko-KR.json b/lang/ko-KR.json
index 2e4f0e5ac4..767e8e220d 100644
--- a/lang/ko-KR.json
+++ b/lang/ko-KR.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "웹사이트 추가",
   "label.admin": "관리자",
+  "label.after": "After",
   "label.all": "전체",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "평균 방문 시간",
   "label.back": "뒤로",
+  "label.before": "Before",
   "label.bounce-rate": "이탈률",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "브라우저",
   "label.cancel": "취소",
   "label.change-password": "비밀번호 변경",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "비밀번호 확인",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "국가",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "범위 지정",
   "label.dashboard": "대시보드",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "날짜 범위",
+  "label.day": "Day",
   "label.default-date-range": "기본 날짜 범위",
   "label.delete": "삭제",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "웹사이트 삭제",
+  "label.description": "Description",
   "label.desktop": "데스크탑",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "기기",
   "label.dismiss": "무시하기",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "도메인",
   "label.dropoff": "Dropoff",
   "label.edit": "편집",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "이벤트",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "합쳐서 보기",
   "label.filter-raw": "전체 보기",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "최근 {x} 시간",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "로그인",
   "label.logout": "로그아웃",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "모바일",
   "label.more": "더 보기",
+  "label.my-websites": "My websites",
   "label.name": "이름",
   "label.new-password": "새 비밀번호",
   "label.none": "None",
-  "label.operating-systems": "운영체제",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "페이지 뷰(PV)",
+  "label.pageTitle": "Page title",
   "label.pages": "페이지",
   "label.password": "비밀번호",
   "label.powered-by": "이 시스템은 {name}에서 구동되고 있습니다.",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "실시간",
+  "label.referrer": "Referrer",
   "label.referrers": "리퍼러",
   "label.refresh": "새로고침",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "필수",
   "label.reset": "리셋",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "저장",
@@ -99,12 +132,15 @@
   "label.settings": "설정",
   "label.share-url": "공유 URL",
   "label.single-day": "하루",
+  "label.sum": "Sum",
   "label.tablet": "태블릿",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "이번 달",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "오늘",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "추적 코드",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "순방문자(UV)",
   "label.unknown": "알 수 없음",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "사용자명",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "상세보기",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "웹사이트",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x}명의 사용자가 보는 중입니다.",
   "message.confirm-delete": "{target}을(를) 삭제하시겠습니까?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "사용자 이름/비밀번호가 잘못되었습니다..",
   "message.invalid-domain": "잘못된 도메인",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "사용 가능한 데이터가 없습니다.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "비밀번호가 일치하지 않음",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "구성된 웹 사이트가 없습니다.",
   "message.page-not-found": "페이지를 찾을 수 없습니다.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "이것은 {target}의 공개적으로 공유된 URL입니다.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "추적 코드",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{os} {device}에서 {browser}을(를) 사용하는 {country}의 방문자",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "구성된 웹 사이트가 없습니다.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{os} {device}에서 {browser}을(를) 사용하는 {country}의 방문자"
 }
diff --git a/lang/lt-LT.json b/lang/lt-LT.json
index e8ef150db1..c8161f1db2 100644
--- a/lang/lt-LT.json
+++ b/lang/lt-LT.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Pridėti svetainę",
   "label.admin": "Administratorius",
+  "label.after": "After",
   "label.all": "Visi",
   "label.all-time": "Visas laikotarpis",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Vidutinė vizito trukmė",
   "label.back": "Atgal",
+  "label.before": "Before",
   "label.bounce-rate": "Atmetimo rodiklis",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Naršyklės",
   "label.cancel": "Atšaukti",
   "label.change-password": "Pakeisti slaptažodį",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Patvirtinti slaptažodį",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Šalys",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Pasirinktinis intervalas",
   "label.dashboard": "Švieslentė",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Laikotarpis",
+  "label.day": "Day",
   "label.default-date-range": "Numatytasis laikotarpis",
   "label.delete": "Ištrinti",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Ištrinti svetainę",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Įrenginiai",
   "label.dismiss": "Gerai",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domenas",
   "label.dropoff": "Dropoff",
   "label.edit": "Redaguoti",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Įvykiai",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Kombinuoti",
   "label.filter-raw": "Neapdoroti",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "{x, plural, =0 {Paskutinės # valandų} zero {Paskutinės # valandų} one {Paskutinė # valanda} other {Paskutinės # valandos}}",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Prisijungti",
   "label.logout": "Atsijungti",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobilusis",
   "label.more": "Daugiau",
+  "label.my-websites": "My websites",
   "label.name": "Pavadinimas",
   "label.new-password": "Naujas slaptažodis",
   "label.none": "None",
-  "label.operating-systems": "Operacinės sistemos",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Savininkas",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Puslapių peržiūros",
+  "label.pageTitle": "Page title",
   "label.pages": "Puslapiai",
   "label.password": "Slaptažodis",
   "label.powered-by": "Powered by {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realiuoju laiku",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "Atnaujinti",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Reikalinga",
   "label.reset": "Atstatyti",
   "label.reset-website": "Atstatyti statistikos duomenis",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Išsaugoti",
@@ -99,12 +132,15 @@
   "label.settings": "Nustatymai",
   "label.share-url": "Pasidalinti nuoroda",
   "label.single-day": "Viena diena",
+  "label.sum": "Sum",
   "label.tablet": "Planšetė",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Šis mėnuo",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Šiandien",
   "label.toggle-charts": "Rodyti / slėpti grafikus",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Sekimo kodas",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unikalūs lankytojai",
   "label.unknown": "Nežinoma",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Vartotojo vardas",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Peržiūrėti detaliau",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Svetainės",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x, plural, =0 {# aktyvių vartotojų} zero {# aktyvių vartotojų} one {# aktyvus vartotojas} other {# aktyvūs vartotojai}}",
   "message.confirm-delete": "Ar esate tikri, jog norite ištrinti svetainę {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Neteisingas vartotojo vardas/slaptažodis.",
   "message.invalid-domain": "Klaidingas domenas",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Nėra jokių duomenų.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Slaptažodžiai nesutampa",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Jūs nesate susikonfiguravę jokių svetainių.",
   "message.page-not-found": "Puslapis nerastas.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Visi šios svetainės statistikos duomenys bus ištrinti, bet sekimo kodas išliks nepaliestas.",
@@ -184,12 +204,8 @@
   "message.share-url": "Tai yra viešai prieinama {target} nuoroda (URL).",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Sekimo kodas",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Lankytojas iš {country}, naudojantis {browser} sistemoje {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Jūs nesate susikonfiguravę jokių svetainių.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Lankytojas iš {country}, naudojantis {browser} sistemoje {os} {device}"
 }
diff --git a/lang/mn-MN.json b/lang/mn-MN.json
index 1d9d98124e..1478c0792c 100644
--- a/lang/mn-MN.json
+++ b/lang/mn-MN.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Веб нэмэх",
   "label.admin": "Админ",
+  "label.after": "After",
   "label.all": "Бүх",
   "label.all-time": "Бүх цаг үеийн",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Зочилсон дундаж хугацаа",
   "label.back": "Буцах",
+  "label.before": "Before",
   "label.bounce-rate": "Нэг хуудас үзээд гарсан",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Хөтөч",
   "label.cancel": "Цуцлах",
   "label.change-password": "Нууц үг солих",
   "label.cities": "Хотууд",
+  "label.city": "City",
   "label.clear-all": "Бүгдийг арилгах",
   "label.confirm": "Батлах",
   "label.confirm-password": "Шинэ нууц үгээ давтах",
+  "label.contains": "Contains",
   "label.continue": "Үргэлжлүүлэх",
   "label.countries": "Улс",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Баг үүсгэх",
   "label.create-user": "Хэрэглэгч үүсгэх",
   "label.created": "Үүсгэсэн",
@@ -28,16 +37,21 @@
   "label.custom-range": "Дурын хугацаа",
   "label.dashboard": "Хянах самбар",
   "label.data": "Өгөгдөл",
+  "label.date": "Date",
   "label.date-range": "Хугацааны муж",
+  "label.day": "Day",
   "label.default-date-range": "Өгөгдмөл хугацааны муж",
   "label.delete": "Устгах",
   "label.delete-team": "Баг устгах",
   "label.delete-user": "Хэрэглэгч устгах",
   "label.delete-website": "Веб устгах",
+  "label.description": "Description",
   "label.desktop": "Суурин компьютер",
   "label.details": "Мэдээлэл",
+  "label.device": "Device",
   "label.devices": "Төхөөрөмж",
   "label.dismiss": "Үл хэргэсэх",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Домэйн",
   "label.dropoff": "Dropoff",
   "label.edit": "Засах",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Үйлдэл",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Нэгтгэсэн",
   "label.filter-raw": "Түүхий",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Нэгдэх",
   "label.join-team": "Багт нэгдэх",
   "label.language": "Хэл",
@@ -61,17 +83,25 @@
   "label.last-hours": "Сүүлийн {x} цаг",
   "label.leave": "Гарах",
   "label.leave-team": "Багаас гарах",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Нэвтрэх",
   "label.logout": "Гарах",
+  "label.max": "Max",
   "label.members": "Гишүүд",
+  "label.min": "Min",
   "label.mobile": "Утас",
   "label.more": "Цааш",
+  "label.my-websites": "My websites",
   "label.name": "Нэр",
   "label.new-password": "Шинэ нууц үг",
   "label.none": "Байхгүй",
-  "label.operating-systems": "Үйлдлийн систем",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Эзэмшигч",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Хуудас үзсэн",
+  "label.pageTitle": "Page title",
   "label.pages": "Хуудас",
   "label.password": "Нууц үг",
   "label.powered-by": "{name} дээр суурилсан",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query параметр",
   "label.realtime": "Яг одоо",
+  "label.referrer": "Referrer",
   "label.referrers": "Чиглүүлэгч",
   "label.refresh": "Сэргээх",
   "label.regenerate": "Дахин үүсгэх",
+  "label.region": "Region",
   "label.regions": "Бүсүүд",
   "label.remove": "Устгах",
   "label.reports": "Reports",
   "label.required": "Шаардлагатай",
   "label.reset": "Дахин эхлүүлэх",
   "label.reset-website": "Тоон үзүүлэлтийг дахин эхлүүлэх",
+  "label.retention": "Retention",
   "label.role": "Эрх",
   "label.run-query": "Run query",
   "label.save": "Хадгалах",
@@ -99,12 +132,15 @@
   "label.settings": "Тохиргоо",
   "label.share-url": "Хуваалцах холбоос",
   "label.single-day": "Нэг өдөр",
+  "label.sum": "Sum",
   "label.tablet": "Таблет",
   "label.team": "Баг",
   "label.team-guest": "Багийн зочин",
   "label.team-id": "Багийн ID",
   "label.team-member": "Багийн гишүүн",
+  "label.team-name": "Team name",
   "label.team-owner": "Багийн эзэмшигч",
+  "label.team-websites": "Team websites",
   "label.teams": "Багууд",
   "label.theme": "Загвар",
   "label.this-month": "Энэ сар",
@@ -114,14 +150,21 @@
   "label.title": "Гарчиг",
   "label.today": "Өнөөдөр",
   "label.toggle-charts": "Графикийг харуулах/нуух",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Мөрдөх код",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Зочин",
   "label.unknown": "Тодорхойгүй",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Хэрэглэгч",
   "label.username": "Хэрэглэгчийн нэр",
   "label.users": "Хэрэглэгчид",
+  "label.value": "Value",
   "label.view": "Харах",
   "label.view-details": "Дэлгэрүүлж харах",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Вебүүд",
   "label.window": "Window",
   "label.yesterday": "Өчигдөр",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "одоо {x} {x, plural, one {зочин} other {зочин}} байна",
   "message.confirm-delete": "Та {target}-г устгахдаа итгэлтэй байна уу?",
   "message.confirm-leave": "Та {target}-с гарахдаа итгэлтэй байна уу?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Буруу хэрэглэгчийн нэр/нууц үг.",
   "message.invalid-domain": "Буруу домэйн",
   "message.min-password-length": "Хамгийн багадаа {n} тэмдэгт",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Өгөгдөл алга.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Нууц үг тохирохгүй байна.",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "Энэ багт ямар ч веб алга.",
   "message.no-teams": "Та ямар ч баг үүсгээгүй байна.",
   "message.no-users": "Хэрэглэгч байхгүй байна.",
+  "message.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
   "message.page-not-found": "Хуудас олдсонгүй.",
   "message.reset-website": "Тоон үзүүлэлийг дахин эхлүүлэхийн тулд доорх хэсэгт {confirmation} гэж бичиж, баталгаажуулна уу.",
   "message.reset-website-warning": "Энэ вебийн бүх тоон үзүүлэлтүүдийг устгах болно. Гэхдээ мөрдөх код хэвэндээ үлдэнэ.",
@@ -184,12 +204,8 @@
   "message.share-url": "Таны вебийн тоон үзүүлэлтүүд доорх URL дээр нийтэд харагдах болно:",
   "message.team-already-member": "Та аль хэдийн энэ багийн гишүүн болсон байна.",
   "message.team-not-found": "Баг олдсонгүй.",
+  "message.team-websites-info": "Вебийг багийн бүх гишүүд үзэж болно.",
   "message.tracking-code": "Энэ вебийн хандалтуудыг мөрдөхийн тулд доорх кодыг HTML-нхээ <head>...</head> хэсэгт байрлуулна уу.",
   "message.user-deleted": "Хэрэглэгч устсан.",
-  "message.visitor-log": "{country} улсаас {os} {device} дээр {browser} хөтөч ашиглан орсон",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "Энэ багт ямар ч веб алга.",
-  "message.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.",
-  "message.team-websites-info": "Вебийг багийн бүх гишүүд үзэж болно.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{country} улсаас {os} {device} дээр {browser} хөтөч ашиглан орсон"
 }
diff --git a/lang/ms-MY.json b/lang/ms-MY.json
index c3a9254cef..5b8769c581 100644
--- a/lang/ms-MY.json
+++ b/lang/ms-MY.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Tambah laman web",
   "label.admin": "Pentadbir",
+  "label.after": "After",
   "label.all": "Semua",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Purata tempoh masa lawatan",
   "label.back": "Kembali",
+  "label.before": "Before",
   "label.bounce-rate": "Kadar lantunan",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Pelayar web",
   "label.cancel": "Batal",
   "label.change-password": "Tukar kata laluan",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Sahkan kata laluan",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Negara",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Julat khas",
   "label.dashboard": "Papan pemuka",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Julat tarikh",
+  "label.day": "Day",
   "label.default-date-range": "Julat tarikh lalai",
   "label.delete": "Padam",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Padam laman web",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Peranti",
   "label.dismiss": "Ketepikan",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domain",
   "label.dropoff": "Dropoff",
   "label.edit": "Edit",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Peristiwa",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Digabungkan",
   "label.filter-raw": "Mentah",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "{x} jam lepas",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Log masuk",
   "label.logout": "Log keluar",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Telefon bimbit",
   "label.more": "Lebih banyak lagi",
+  "label.my-websites": "My websites",
   "label.name": "Nama",
   "label.new-password": "Kata laluan baru",
   "label.none": "None",
-  "label.operating-systems": "Sistem operasi",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Paparan halaman",
+  "label.pageTitle": "Page title",
   "label.pages": "Halaman",
   "label.password": "Kata laluan",
   "label.powered-by": "Disediakan oleh {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Siaran langsung",
+  "label.referrer": "Referrer",
   "label.referrers": "Perujuk",
   "label.refresh": "Muat semula",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Diperlukan",
   "label.reset": "Tetapkan semula",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Simpan",
@@ -99,12 +132,15 @@
   "label.settings": "Tetapan",
   "label.share-url": "Kongsikan URL",
   "label.single-day": "Satu hari",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Bulan ini",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Hari ini",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Kod penjejakan",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Pelawat unik",
   "label.unknown": "Tidak diketahui",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nama pengguna",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Lihat butiran",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Laman web",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} semasa {x, plural, one {pelawat} other {pelawat}}",
   "message.confirm-delete": "Pastikah anda ingin memadam {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Pengguna/kata laluan tidak betul.",
   "message.invalid-domain": "Domain tidak sah",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Tiada data yang boleh didapati.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Kata laluan tidak sepadan",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Anda tidak ada sebarang laman web yang telah dikonfigurasikan.",
   "message.page-not-found": "Halaman tidak dijumpai.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "Ini adalah URL berkongsi untuk {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Kod penjejakan",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Pelawat dari {country} mengguna {browser} pada {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Anda tidak ada sebarang laman web yang telah dikonfigurasikan.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Pelawat dari {country} mengguna {browser} pada {os} {device}"
 }
diff --git a/lang/my-MM.json b/lang/my-MM.json
new file mode 100644
index 0000000000..de92b275d0
--- /dev/null
+++ b/lang/my-MM.json
@@ -0,0 +1,195 @@
+{
+  "label.access-code": "ဝင်ခွင့်ကုဒ်",
+  "label.actions": "လုပ်ဆောင်ချက်များ",
+  "label.activity-log": "လုပ်ဆောင်ချက်စာရင်း",
+  "label.add": "ထပ်ထည့်မည်",
+  "label.add-description": "အကြောင်းအရာဖော်ပြချက် ထည့်မည်",
+  "label.add-website": "ဝက်ဘ်ဆိုဒ်ထည့်မည်",
+  "label.admin": "အက်ဒမင်",
+  "label.all": "အားလုံး",
+  "label.all-time": "အချိန်အစမှအခုထိ",
+  "label.analytics": "အန်နလစ်တစ်",
+  "label.average-visit-time": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်",
+  "label.back": "နောက်သို့",
+  "label.bounce-rate": "Bounce နှုန်း",
+  "label.browsers": "ဝက်ဘ်ဘရောင်ဇာများ",
+  "label.cancel": "မလုပ်တော့ပါ",
+  "label.change-password": "စကားဝှက် ပြောင်းမည်",
+  "label.cities": "မြို့များ",
+  "label.clear-all": "အားလုံးကိုဖျက်မည်",
+  "label.confirm": "အတည်ပြုသည်",
+  "label.confirm-password": "စကားဝှက်အတည်ပြုသည်",
+  "label.continue": "ဆက်သွားမည်",
+  "label.countries": "နိုင်ငံများ",
+  "label.create-team": "Team ပြုလုပ်မည်",
+  "label.create-user": "အသုံးပြုသူထည့်မည်",
+  "label.created": "ပြုလုပ်ပြီးသော",
+  "label.current-password": "လက်ရှိစကားဝှက်",
+  "label.custom-range": "အချိန်အပိုင်းအခြားရွေးရန်",
+  "label.dashboard": "ဒက်ရှ်ဘုတ်",
+  "label.data": "ဒေတာ",
+  "label.date-range": "ရက်အပိုင်းအခြား",
+  "label.default-date-range": "ပုံသေ ရက်အပိုင်းအခြား",
+  "label.delete": "ဖျက်မည်",
+  "label.delete-team": "Team ကိုဖျက်မည်",
+  "label.delete-user": "အသုံးပြုသူကိုဖျက်မည်",
+  "label.delete-website": "ဝက်ဘ်ဆိုဒ်ကိုဖျက်မည်",
+  "label.desktop": "စားပွဲတင်ကွန်ပျူတာ",
+  "label.details": "အသေးစိတ်",
+  "label.devices": "အသုံးပြုသည့် ကိရိယာများ",
+  "label.dismiss": "ပိတ်ပါ",
+  "label.domain": "ဒိုမိန်း",
+  "label.dropoff": "Dropoff",
+  "label.edit": "ပြုပြင်မည်",
+  "label.edit-dashboard": "ဒက်ရှ်ဘုတ်ကို ပြုပြင်မည်",
+  "label.enable-share-url": "ဝေငှခြင်းကိုလင့်ကို ဖွင့်မည်",
+  "label.event": "အဖြစ်အပျက်",
+  "label.event-data": "အဖြစ်အပျက် ဒေတာ",
+  "label.events": "အဖြစ်အပျက်များ",
+  "label.field": "Field အမည်",
+  "label.fields": "Field အမည်များ",
+  "label.filter-combined": "ပေါင်းစပ်ပြီး",
+  "label.filter-raw": "အရှိအတိုင်း",
+  "label.funnel": "ဖန်နယ်",
+  "label.insights": "အသေးစိတ်သိမြင်နိုင်ရန်",
+  "label.join": "ဝင်မည်",
+  "label.join-team": "အသင်းဝင်မည်",
+  "label.language": "ဘာသာစကား",
+  "label.languages": "ဘာသာစကားများ",
+  "label.laptop": "လက်တော့ပ်",
+  "label.last-days": "လွန်ခဲ့သော {x} ရက်က",
+  "label.last-hours": "လွန်ခဲ့သော {x} နာရီက",
+  "label.leave": "ထွက်မည်",
+  "label.leave-team": "အသင်းမှထွက်မည်",
+  "label.login": "လော့ဂ်အင်",
+  "label.logout": "လော့ဂ်အောက်လုပ်မည်",
+  "label.members": "အဖွဲ့ဝင်များ",
+  "label.mobile": "မိုဘိုင်း",
+  "label.more": "နောက်ထပ်",
+  "label.name": "အမည်",
+  "label.new-password": "စကားဝှက်အသစ်",
+  "label.none": "မရှိပါ",
+  "label.operating-systems": "ကွန်ပျူတာလည်ပတ်မှုစနစ်",
+  "label.owner": "ပိုင်ဆိုင်သူ",
+  "label.page-views": "ဝင်ရောက်ကြည့်ရှုသူ",
+  "label.pages": "စာမျက်နှာများ",
+  "label.password": "စကားဝှက်",
+  "label.powered-by": "{name} ထောက်ပံ့သည်",
+  "label.profile": "ပရိုဖိုင်း",
+  "label.queries": "Queries (ကွာရီများ)",
+  "label.query": "Query (ကွာရီ)",
+  "label.query-parameters": "Query parameters (ကွာရီပါရာမီတာများ)",
+  "label.realtime": "အချိန်နှင့်တပြေးညီ",
+  "label.referrers": "ရည်ညွှန်းမှုများ",
+  "label.refresh": "Refresh လုပ်မည်",
+  "label.regenerate": "ပြန်ထုတ်မည်",
+  "label.regions": "ဒေသများ",
+  "label.remove": "ဖျက်မည်",
+  "label.reports": "တင်ပြမှုများ",
+  "label.required": "လိုအပ်သည်",
+  "label.reset": "ပြန်စမည်",
+  "label.reset-website": "ဝက်ဘ်ဆိုဒ်ဒေတာကိုဖျက်မည်",
+  "label.role": "အခန်းကဏ္ဍ",
+  "label.run-query": "Query ကိုလုပ်ဆောင်မည်",
+  "label.save": "သိမ်းဆည်းမည်",
+  "label.screens": "မြင်ကွင်းများ",
+  "label.select-date": "ရက်ရွေးပါ",
+  "label.select-website": "ဝဘက်ဘ်ဆိုဒ်ရွေးပါ",
+  "label.sessions": "ဆက်ရှင်များ",
+  "label.settings": "ဆက်တင်များ",
+  "label.share-url": "URL ကိုရှဲမည်",
+  "label.single-day": "တစ်ရက်အတွင်း",
+  "label.tablet": "တက်ဘလက်",
+  "label.team": "အသင်း",
+  "label.team-guest": "အသင်း ဧည့်သည်",
+  "label.team-id": "အသင်း အိုင်ဒီ",
+  "label.team-member": "အသင်းဝင်",
+  "label.team-owner": "အသင်းကိုပိုင်ဆိုင်သူ",
+  "label.teams": "အသင်းများ",
+  "label.theme": "Theme (အပြင်အဆင်)",
+  "label.this-month": "ယခုလ",
+  "label.this-week": "ယခုအပတ်",
+  "label.this-year": "ယခုနှစ်",
+  "label.timezone": "အချိန်ဇုန်",
+  "label.title": "ခေါင်းစဥ်",
+  "label.today": "ယနေ့",
+  "label.toggle-charts": "ဇယားများကို အဖွင့်အပိတ်လုပ်မည်",
+  "label.tracking-code": "ထရက်လုပ်သည့် ကုဒ်",
+  "label.unique-visitors": "ဝင်ရောက်သူ (ထပ်ခြင်းမရှိ)",
+  "label.unknown": "မသိသော",
+  "label.url": "URL",
+  "label.urls": "URL များ",
+  "label.user": "အသုံးပြုသူ",
+  "label.username": "အသုံးပြုသူအမည်",
+  "label.users": "အသုံးပြုသူများ",
+  "label.view": "ဝင်ရောက်ကြည့်ရှုမှု",
+  "label.view-details": "အသေးစိတ်ကို ကြည့်ရှုမည်",
+  "label.view-only": "ဝင်ရောက်ကြည့်ရှုမှုများသာ",
+  "label.views": "ဝင်ရောက်ကြည့်ရှုမှုများ",
+  "label.visitors": "ဝင်ရောက်ကြည့်ရှုသူများ",
+  "label.website": "ဝက်ဘ်ဆိုဒ်",
+  "label.website-id": "ဝက်ဘ်ဆိုဒ် အိုင်ဒီ",
+  "label.websites": "ဝက်ဘ်ဆိုဒ်များ",
+  "label.window": "ဝင်းဒိုး",
+  "label.yesterday": "မနေ့က",
+  "labels.after": "ပြီးနောက်",
+  "labels.average": "ပျမ်းမျှ",
+  "labels.before": "မတိုင်မီ",
+  "labels.breakdown": "ခွဲခြမ်းစိတ်ဖြာမှု",
+  "labels.contains": "ပါဝင်သည်",
+  "labels.create-report": "ရီပို့လုပ်မည်",
+  "labels.description": "ရှင်းပြချက်",
+  "labels.does-not-contain": "မပါဝင်ပါ",
+  "labels.does-not-equal": "မတူညီပါ",
+  "labels.equals": "တူညီသည်",
+  "labels.false": "မှားသည်",
+  "labels.filters": "Filter များ",
+  "labels.greater-than": "ထက်ပို၍ကြီးသည်",
+  "labels.greater-than-equals": "ထက်ပို၍ကြီးသည်သို့မဟုတ်တူသည်",
+  "labels.less-than": "ထက်ပို၍ငယ်သည်",
+  "labels.less-than-equals": "ထက်ပို၍ငယ်သည်သို့မဟုတ်တူသည်",
+  "labels.max": "အများဆုံး",
+  "labels.min": "အနည်းဆုံး",
+  "labels.overview": "အပေါ်ယံမြင်ကွင်း",
+  "labels.sum": "ပေါင်းလဒ်",
+  "labels.total": "စုစုပေါင်း",
+  "labels.total-records": "မှတ်တမ်းစုစုပေါင်း",
+  "labels.true": "မှန်သည်",
+  "labels.type": "အမျိုးအစား",
+  "labels.unique": "Unique",
+  "labels.untitled": "ခေါင်းစဉ်မရှိ",
+  "labels.value": "တန်ဖိုး",
+  "message.active-users": "{x} လက်ရှိအသုံးပြုနေသူ {x, plural, one {ယောက်} other {ယောက်}}",
+  "message.confirm-delete": "{target} ကို ဖျက်ရန် သေချာပါသလား?",
+  "message.confirm-leave": "{target} ကို ထွက်ရန် သေချာပါသလား?",
+  "message.confirm-reset": "{target} ကို ဖျက်၍ပြန်စလုပ်ရန် သေချာပါသလား?",
+  "message.delete-account": "ဤအကောင့်ကိုဖျက်ရန် {confirmation} ကို ရိုက်ထည့်ပေးပါ.",
+  "message.delete-website": "ဤ ဝက်ဘ်ဆိုဒ်ကိုဖျက်ရန် {confirmation} ကို ရိုက်ထည့်ပေးပါ",
+  "message.delete-website-warning": "ဝက်ဘ်ဆိုဒ် ဒေတာအကုန် ဖျက်မည်",
+  "message.error": "မှားယွင်းမှုတစ်ခု ရှိသွားပါသည်",
+  "message.event-log": "{url} တွင် {event}",
+  "message.go-to-settings": "ဆက်တင်သို့ သွားရန်",
+  "message.incorrect-username-password": "အသုံးပြုသူအမည် သို့မဟုတ် စကားဝှက် မှားနေသည်",
+  "message.invalid-domain": "ဒိုမိန်း မမှန်ပါ http/https. မပါရပါ",
+  "message.min-password-length": "အနည်းဆုံး {n} character ရှိရမည်",
+  "message.no-data-available": "ဒေတာ မရှိပါ",
+  "message.no-event-data": "အဖြစ်အပျက်ဒေတာ မရှိပါ",
+  "message.no-match-password": "စကားဝှက် မှားနေသည်",
+  "message.no-teams": "အသင်း မပြုလုပ်ရသေးပါ",
+  "message.no-users": "အသုံးပြုသူ မရှိသေးပါ",
+  "message.page-not-found": "ဤစာမျက်နှာသည် မရှိပါ",
+  "message.reset-website": "ဤ ဝက်ဘ်ဆိုဒ်ဒေတာကိုဖျက်၍ ပြန်စလုပ်ရန် အောက်တွင် {confirmation} ကို ရိုက်ထည့်ပေးပါ",
+  "message.reset-website-warning": "ဤဝက်ဘ်ဆိုဒ်က စာရင်းအချက်အလက်များကို ဖျက်မည်၊ ဆက်တင်ဒေတာများ မပါပါ",
+  "message.saved": "မှတ်သားပြီး",
+  "message.share-url": "သင့်ဝက်ဆိုဒ်ဘ်၏ စာရင်းအချက်အလက်များကို အောက်ပါ URL တွင် ဝင်ရောက်ကြည့်ရှုနိုင်သည်",
+  "message.team-already-member": "ဤအသင်းတွင် ဝင်ပြီးသားဖြစ်နေသည်",
+  "message.team-not-found": "အသင်း မရှိပါ",
+  "message.tracking-code": "ဤဝက်ဘ်ဆိုဒ်၏ ဒေတာကိုကောက်ခံရန် အောက်ပါ code ကို သင်၏ HTML တွင်ထည့်ပါ",
+  "message.user-deleted": "အသုံးပြုသူ ဖျက်ပြီးပါပြီ",
+  "message.visitor-log": "{country} မှ {browser} ဖြင့် {os} {device} တွင် ဝင်ရောက်ကြည့်ရှုသူ",
+  "message.no-results-found": "ရလဒ်မရှိပါ",
+  "message.no-team-websites": "ဤအသင်းတွင် ဝက်ဘ်ဆိုက်မရှိသေးပါ",
+  "message.no-websites-configured": "ဝက်ဘ်ဆိုဒ်တစ်ခုမှ မထည့်ရသေးပါ",
+  "message.team-websites-info": "ဤဝက်ဘ်ဆိုဒ်များကို အသင်းထဲမှ လူတိုင်းဝင်ကြည့်နိုင်သည်",
+  "message.new-version-available": "အူမာမီ {version} အသစ်ထွက်နေပါပြီ"
+}
diff --git a/lang/nb-NO.json b/lang/nb-NO.json
index fcd299653e..654c3c7919 100644
--- a/lang/nb-NO.json
+++ b/lang/nb-NO.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Legg til nettsted",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Alle",
   "label.all-time": "Noensinne",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Gjennomsnittlig besøkstid",
   "label.back": "Tilbake",
+  "label.before": "Before",
   "label.bounce-rate": "Avvisningsfrekvens",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Nettlesere",
   "label.cancel": "Avvis",
   "label.change-password": "Bytt passord",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Godkjenn passord",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Land",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Egendefinert utvalg",
   "label.dashboard": "Dashbord",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Datointervall",
+  "label.day": "Day",
   "label.default-date-range": "Standard datoperiode",
   "label.delete": "Slett",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Slett nettstedet",
+  "label.description": "Description",
   "label.desktop": "Stasjonær",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Enheter",
   "label.dismiss": "Avbryt",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domene",
   "label.dropoff": "Dropoff",
   "label.edit": "Rediger",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Arrangementer",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Kombinert",
   "label.filter-raw": "Rå",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Språk",
@@ -61,17 +83,25 @@
   "label.last-hours": "Siste {x} timer",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Logg inn",
   "label.logout": "Logg ut",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobiltelefon",
   "label.more": "Mer",
+  "label.my-websites": "My websites",
   "label.name": "Navn",
   "label.new-password": "Nytt passord",
   "label.none": "None",
-  "label.operating-systems": "Operativsystemer",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Eier",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Sidevisninger",
+  "label.pageTitle": "Page title",
   "label.pages": "Sider",
   "label.password": "Passord",
   "label.powered-by": "Drevet av {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Sanntid",
+  "label.referrer": "Referrer",
   "label.referrers": "Referanser",
   "label.refresh": "Oppdater",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Påkrevd",
   "label.reset": "Nullstill",
   "label.reset-website": "Nullstill statistikk",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Lagre",
@@ -99,12 +132,15 @@
   "label.settings": "Innstillinger",
   "label.share-url": "Del URL",
   "label.single-day": "Enkelt dag",
+  "label.sum": "Sum",
   "label.tablet": "Nettbrett",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Denne måneden",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "I dag",
   "label.toggle-charts": "Veksle grafer",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Sporingskode",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unike besøkende",
   "label.unknown": "Ukjent",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Brukernavn",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Vis detaljer",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Nettsteder",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {besøkende} other {besøkende}} nå",
   "message.confirm-delete": "Er du sikker på at du vil slette {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Ugyldig brukernavn/passord.",
   "message.invalid-domain": "Ugyldig domene",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Ingen data tilgjengelig.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passordene er ikke like",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Du har ikke satt opp noen nettsteder.",
   "message.page-not-found": "Side ikke funnet.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistikk for denne nettsiden vil bli slettet, men sporingskoden din vil forbli uberørt.",
@@ -184,12 +204,8 @@
   "message.share-url": "Dette er den offentlige delings-URL-en for {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Sporingskode",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Besøkende fra {country} med {browser} på {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Du har ikke satt opp noen nettsteder.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Besøkende fra {country} med {browser} på {os} {device}"
 }
diff --git a/lang/nl-NL.json b/lang/nl-NL.json
index 90b4ea40ca..ad30cf36ba 100644
--- a/lang/nl-NL.json
+++ b/lang/nl-NL.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Website koppelen",
   "label.admin": "Beheerder",
+  "label.after": "After",
   "label.all": "Alles",
   "label.all-time": "Onbeperkt",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Gemiddelde bezoektijd",
   "label.back": "Terug",
+  "label.before": "Before",
   "label.bounce-rate": "Bouncepercentage",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "Annuleren",
   "label.change-password": "Wachtwoord wijzigen",
   "label.cities": "Steden",
+  "label.city": "City",
   "label.clear-all": "Filters wissen",
   "label.confirm": "Bevestigen",
   "label.confirm-password": "Wachtwoord bevestigen",
+  "label.contains": "Contains",
   "label.continue": "Doorgaan",
   "label.countries": "Landen",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Team aanmaken",
   "label.create-user": "Gebruiker maken",
   "label.created": "Gemaakt",
@@ -28,16 +37,21 @@
   "label.custom-range": "Aangepast bereik",
   "label.dashboard": "Overzicht",
   "label.data": "Gegevens",
+  "label.date": "Date",
   "label.date-range": "Datumbereik",
+  "label.day": "Day",
   "label.default-date-range": "Standaard bereik",
   "label.delete": "Verwijderen",
   "label.delete-team": "Team verwijderen",
   "label.delete-user": "Verwijder gebruiker",
   "label.delete-website": "Website verwijderen",
+  "label.description": "Description",
   "label.desktop": "Computer",
   "label.details": "Informatie",
+  "label.device": "Device",
   "label.devices": "Apparaten",
   "label.dismiss": "Negeren",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domein",
   "label.dropoff": "Dropoff",
   "label.edit": "Bewerken",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Gebeurtenissen",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Gecombineerd",
   "label.filter-raw": "Ruw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Lid worden",
   "label.join-team": "Word lid van een team",
   "label.language": "Taal",
@@ -61,17 +83,25 @@
   "label.last-hours": "Laatste {x} uur",
   "label.leave": "Verlaten",
   "label.leave-team": "Verlaat team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Inloggen",
   "label.logout": "Uitloggen",
+  "label.max": "Max",
   "label.members": "Gebruikers",
+  "label.min": "Min",
   "label.mobile": "Mobiel",
   "label.more": "Toon meer",
+  "label.my-websites": "My websites",
   "label.name": "Naam",
   "label.new-password": "Nieuw wachtwoord",
   "label.none": "Geen",
-  "label.operating-systems": "Besturingssystemen",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Eigenaar",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Paginaweergaven",
+  "label.pageTitle": "Page title",
   "label.pages": "Pagina's",
   "label.password": "Wachtwoord",
   "label.powered-by": "mogelijk gemaakt door {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "URL-parameters",
   "label.realtime": "Actueel",
+  "label.referrer": "Referrer",
   "label.referrers": "Verwijzers",
   "label.refresh": "Vernieuwen",
   "label.regenerate": "Opnieuw genereren",
+  "label.region": "Region",
   "label.regions": "Regio's",
   "label.remove": "Verwijderen",
   "label.reports": "Reports",
   "label.required": "Verplicht",
   "label.reset": "Opnieuw instellen",
   "label.reset-website": "Statistieken opnieuw instellen",
+  "label.retention": "Retention",
   "label.role": "Gebruikersrol",
   "label.run-query": "Run query",
   "label.save": "Opslaan",
@@ -99,12 +132,15 @@
   "label.settings": "Instellingen",
   "label.share-url": "URL delen",
   "label.single-day": "Enkele dag",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team gast",
   "label.team-id": "Team ID",
   "label.team-member": "Teamlid",
+  "label.team-name": "Team name",
   "label.team-owner": "Teameigenaar",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Thema",
   "label.this-month": "Deze maand",
@@ -114,14 +150,21 @@
   "label.title": "Titel",
   "label.today": "Vandaag",
   "label.toggle-charts": "Grafieken tonen/verbergen",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Volgcode",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unieke bezoekers",
   "label.unknown": "Onbekend",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Gebruiker",
   "label.username": "Gebruikersnaam",
   "label.users": "Gebruikers",
+  "label.value": "Value",
   "label.view": "Weergave",
   "label.view-details": "Meer details",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Gisteren",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} actieve {x, plural, one {bezoeker} other {bezoekers}}",
   "message.confirm-delete": "Weet je zeker dat je {target} wilt verwijderen?",
   "message.confirm-leave": "Weet je zeker dat je {target} wilt verlaten?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Incorrecte gebruikersnaam/wachtwoord.",
   "message.invalid-domain": "Ongeldig domein",
   "message.min-password-length": "Minimale lengte van {n} tekens",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Geen gegevens beschikbaar.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Wachtwoorden komen niet overeen",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "Er zijn geen websites gekoppeld aan dit team.",
   "message.no-teams": "Er zijn nog geen teams aangemaakt.",
   "message.no-users": "Er zijn geen gebruikers.",
+  "message.no-websites-configured": "Je hebt geen websites ingesteld.",
   "message.page-not-found": "Pagina niet gevonden.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Alle bijhorende statistieken van deze website worden verwijderd, maar jouw volgcode blijft gelden.",
@@ -184,12 +204,8 @@
   "message.share-url": "Met deze URL kan {target} openbaar gedeeld worden.",
   "message.team-already-member": "Je bent al lid van het team.",
   "message.team-not-found": "Team niet gevonden.",
+  "message.team-websites-info": "Websites kunnen door iedereen in het team worden bekeken.",
   "message.tracking-code": "Volgcode",
   "message.user-deleted": "Gebruiker verwijderd.",
-  "message.visitor-log": "Bezoeker uit {country} met {browser} op een {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "Er zijn geen websites gekoppeld aan dit team.",
-  "message.no-websites-configured": "Je hebt geen websites ingesteld.",
-  "message.team-websites-info": "Websites kunnen door iedereen in het team worden bekeken.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Bezoeker uit {country} met {browser} op een {os} {device}"
 }
diff --git a/lang/pl-PL.json b/lang/pl-PL.json
index 79823f5726..eb94061392 100644
--- a/lang/pl-PL.json
+++ b/lang/pl-PL.json
@@ -6,21 +6,30 @@
   "label.add-description": "Dodaj opis",
   "label.add-website": "Dodaj witrynę",
   "label.admin": "Administrator",
+  "label.after": "Po",
   "label.all": "Wszystkie",
   "label.all-time": "Cały czas",
   "label.analytics": "Analityka",
+  "label.average": "Średnia",
   "label.average-visit-time": "Średni czas wizyty",
   "label.back": "Powrót",
+  "label.before": "Przed",
   "label.bounce-rate": "Współczynnik odrzuceń",
+  "label.breakdown": "Rozbicie",
+  "label.browser": "Browser",
   "label.browsers": "Przeglądarki",
   "label.cancel": "Anuluj",
   "label.change-password": "Zmień hasło",
   "label.cities": "Miasta",
+  "label.city": "City",
   "label.clear-all": "Wyczyść wszystko",
   "label.confirm": "Potwierdź",
   "label.confirm-password": "Potwierdź hasło",
+  "label.contains": "Zawiera",
   "label.continue": "Kontynuuj",
   "label.countries": "Kraje",
+  "label.country": "Country",
+  "label.create-report": "Stwórz raport",
   "label.create-team": "Utwórz zespół",
   "label.create-user": "Utwórz użytkownika",
   "label.created": "Utworzony",
@@ -28,16 +37,21 @@
   "label.custom-range": "Zakres niestandardowy",
   "label.dashboard": "Panel",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Zakres dat",
+  "label.day": "Day",
   "label.default-date-range": "Domyślny zakres dat",
   "label.delete": "Usuń",
   "label.delete-team": "Usuń zespół",
   "label.delete-user": "Usuń użytkownika",
   "label.delete-website": "Usuń witrynę",
+  "label.description": "Opis",
   "label.desktop": "Komputer",
   "label.details": "Szczegóły",
+  "label.device": "Device",
   "label.devices": "Urządzenia",
   "label.dismiss": "Odrzuć",
+  "label.does-not-contain": "Nie zawiera",
   "label.domain": "Domena",
   "label.dropoff": "Dropoff",
   "label.edit": "Edytuj",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Dane zdarzenia",
   "label.events": "Zdarzenia",
+  "label.false": "Fałsz",
   "label.field": "Pole",
   "label.fields": "Pola",
   "label.filter-combined": "Połączone",
   "label.filter-raw": "Surowe dane",
+  "label.filters": "Filtry",
   "label.funnel": "Lejek",
+  "label.greater-than": "Większe niż",
+  "label.greater-than-equals": "Większe niż lub równe",
   "label.insights": "Insights",
+  "label.is": "Równe",
+  "label.is-not": "Nie jest równe",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Dołącz",
   "label.join-team": "Dołącz do zespołu",
   "label.language": "Język",
@@ -61,17 +83,25 @@
   "label.last-hours": "Ostatnie {x} godzin",
   "label.leave": "Opuść",
   "label.leave-team": "Opuść zespół",
+  "label.less-than": "Mniejsze niż",
+  "label.less-than-equals": "Mniejsze niż lub równe",
   "label.login": "Zaloguj się",
   "label.logout": "Wyloguj",
+  "label.max": "Maks",
   "label.members": "Członkowie",
+  "label.min": "Min",
   "label.mobile": "Smartfon",
   "label.more": "Więcej",
+  "label.my-websites": "My websites",
   "label.name": "Nazwa",
   "label.new-password": "Nowe hasło",
   "label.none": "Brak",
-  "label.operating-systems": "System operacyjny",
+  "label.os": "OS",
+  "label.overview": "Przegląd",
   "label.owner": "Właściciel",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Wyświetlenia strony",
+  "label.pageTitle": "Page title",
   "label.pages": "Strony",
   "label.password": "Hasło",
   "label.powered-by": "Obsługiwane przez {name}",
@@ -80,15 +110,18 @@
   "label.query": "Zapytanie",
   "label.query-parameters": "Parametry zapytania",
   "label.realtime": "Czas rzeczywisty",
+  "label.referrer": "Referrer",
   "label.referrers": "Źródła odsyłające",
   "label.refresh": "Odśwież",
   "label.regenerate": "Wygeneruj ponownie",
+  "label.region": "Region",
   "label.regions": "Regiony",
   "label.remove": "Usuń",
   "label.reports": "Raporty",
   "label.required": "Wymagany",
   "label.reset": "Zresetuj",
   "label.reset-website": "Zresetuj statystyki",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Uruchom zapytanie",
   "label.save": "Zapisz",
@@ -99,12 +132,15 @@
   "label.settings": "Ustawienia",
   "label.share-url": "Udostępnij adres URL",
   "label.single-day": "W tym dniu",
+  "label.sum": "Suma",
   "label.tablet": "Tablet",
   "label.team": "Zespół",
   "label.team-guest": "Gość zespołu",
   "label.team-id": "ID zespołu",
   "label.team-member": "Członek zespołu",
+  "label.team-name": "Team name",
   "label.team-owner": "Właściciel zespołu",
+  "label.team-websites": "Team websites",
   "label.teams": "Zespoły",
   "label.theme": "Motyw",
   "label.this-month": "W tym miesiącu",
@@ -114,14 +150,21 @@
   "label.title": "Tytuł",
   "label.today": "Dzisiaj",
   "label.toggle-charts": "Przełącz wykresy",
+  "label.total": "W sumie",
+  "label.total-records": "Suma rekordów",
   "label.tracking-code": "Kod śledzenia",
+  "label.true": "Prawda",
+  "label.type": "Typ",
+  "label.unique": "Unikalne",
   "label.unique-visitors": "Unikalni odwiedzający",
   "label.unknown": "Nieznany",
+  "label.untitled": "Bez tytułu",
   "label.url": "Link",
   "label.urls": "Linki",
   "label.user": "Użytkownik",
   "label.username": "Nazwa użytkownika",
   "label.users": "Użytkownicy",
+  "label.value": "Wartość",
   "label.view": "Zobacz",
   "label.view-details": "Pokaż szczegóły",
   "label.view-only": "Tylko do odczytu",
@@ -132,33 +175,6 @@
   "label.websites": "Witryny",
   "label.window": "Okno",
   "label.yesterday": "Wczoraj",
-  "labels.after": "Po",
-  "labels.average": "Średnia",
-  "labels.before": "Przed",
-  "labels.breakdown": "Rozbicie",
-  "labels.contains": "Zawiera",
-  "labels.create-report": "Stwórz raport",
-  "labels.description": "Opis",
-  "labels.does-not-contain": "Nie zawiera",
-  "labels.does-not-equal": "Nie jest równe",
-  "labels.equals": "Równe",
-  "labels.false": "Fałsz",
-  "labels.filters": "Filtry",
-  "labels.greater-than": "Większe niż",
-  "labels.greater-than-equals": "Większe niż lub równe",
-  "labels.less-than": "Mniejsze niż",
-  "labels.less-than-equals": "Mniejsze niż lub równe",
-  "labels.max": "Maks",
-  "labels.min": "Min",
-  "labels.overview": "Przegląd",
-  "labels.sum": "Suma",
-  "labels.total": "W sumie",
-  "labels.total-records": "Suma rekordów",
-  "labels.true": "Prawda",
-  "labels.type": "Typ",
-  "labels.unique": "Unikalne",
-  "labels.untitled": "Bez tytułu",
-  "labels.value": "Wartość",
   "message.active-users": "{x} aktualnie {x, plural, one {odwiedzający} other {odwiedzających}}",
   "message.confirm-delete": "Czy na pewno chcesz usunąć {target}?",
   "message.confirm-leave": "Czy na pewno chcesz opuścić {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Nieprawidłowa nazwa użytkownika/hasło.",
   "message.invalid-domain": "Nieprawidłowa witryna",
   "message.min-password-length": "Minimalna długość {n} znaków",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Brak dostępnych danych.",
   "message.no-event-data": "Brak dostępnych danych o zdarzeniach.",
   "message.no-match-password": "Hasła się nie zgadzają",
+  "message.no-results-found": "Nie znaleziono wyników.",
+  "message.no-team-websites": "Ten zespół nie ma żadnych witryn internetowych.",
   "message.no-teams": "Nie stworzyłeś żadnych zespołów.",
   "message.no-users": "Nie ma żadnych użytkowników.",
+  "message.no-websites-configured": "Nie masz skonfigurowanych żadnych witryn internetowych.",
   "message.page-not-found": "Strona nie znaleziona.",
   "message.reset-website": "Aby zresetować tę witrynę, wpisz {confirmation} w polu poniżej, aby potwierdzić.",
   "message.reset-website-warning": "Wszystkie statystyki tej witryny zostaną usunięte, ale kod śledzenia pozostanie nienaruszony.",
@@ -184,12 +204,8 @@
   "message.share-url": "To jest publicznie udostępniany adres URL dla {target}.",
   "message.team-already-member": "Jesteś już członkiem zespołu.",
   "message.team-not-found": "Nie znaleziono zespołu.",
+  "message.team-websites-info": "Strony internetowe mogą być przeglądane przez każdego członka zespołu.",
   "message.tracking-code": "Kod śledzenia",
   "message.user-deleted": "Użytkownik usunięty.",
-  "message.visitor-log": "Odwiedzający z {country} używa {browser} na {os} {device}",
-  "message.no-results-found": "Nie znaleziono wyników.",
-  "message.no-team-websites": "Ten zespół nie ma żadnych witryn internetowych.",
-  "message.no-websites-configured": "Nie masz skonfigurowanych żadnych witryn internetowych.",
-  "message.team-websites-info": "Strony internetowe mogą być przeglądane przez każdego członka zespołu.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Odwiedzający z {country} używa {browser} na {os} {device}"
 }
diff --git a/lang/pt-BR.json b/lang/pt-BR.json
index dd1edf0b34..b68d961540 100644
--- a/lang/pt-BR.json
+++ b/lang/pt-BR.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Adicionar site",
   "label.admin": "Administrador",
+  "label.after": "Depois",
   "label.all": "Todos",
   "label.all-time": "Todo o período",
   "label.analytics": "Estatísticas",
+  "label.average": "Average",
   "label.average-visit-time": "Tempo médio da visita",
   "label.back": "Voltar",
+  "label.before": "Antes",
   "label.bounce-rate": "Taxa de rejeição",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
   "label.change-password": "Alterar a senha",
   "label.cities": "Cidades",
+  "label.city": "City",
   "label.clear-all": "Limpar tudo",
   "label.confirm": "Confirmar",
   "label.confirm-password": "Confirme a nova senha",
+  "label.contains": "Contains",
   "label.continue": "Continuar",
   "label.countries": "Países",
+  "label.country": "Country",
+  "label.create-report": "Criar relatório",
   "label.create-team": "Criar time",
   "label.create-user": "Criar usuário",
   "label.created": "Criado",
@@ -28,16 +37,21 @@
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Painel",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Intervalo de datas",
+  "label.day": "Day",
   "label.default-date-range": "Intervalo de datas predefinido",
   "label.delete": "Remover",
   "label.delete-team": "Remover time",
   "label.delete-user": "Remover usuário",
   "label.delete-website": "Remover site",
+  "label.description": "Descrição",
   "label.desktop": "Computador",
   "label.details": "Detalhes",
+  "label.device": "Device",
   "label.devices": "Dispositivos",
   "label.dismiss": "Dispensar",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domínio",
   "label.dropoff": "Dropoff",
   "label.edit": "Editar",
@@ -46,12 +60,20 @@
   "label.event": "Evento",
   "label.event-data": "Event data",
   "label.events": "Eventos",
+  "label.false": "False",
   "label.field": "Campo",
   "label.fields": "Campos",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Dados brutos",
+  "label.filters": "Filters",
   "label.funnel": "Funil",
+  "label.greater-than": "Maior que",
+  "label.greater-than-equals": "Maior que ou igual",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Entrar",
   "label.join-team": "Entrar no time",
   "label.language": "Idioma",
@@ -61,17 +83,25 @@
   "label.last-hours": "Últimas {x} horas",
   "label.leave": "Sair",
   "label.leave-team": "Sair do time",
+  "label.less-than": "Menor que",
+  "label.less-than-equals": "Menor que ou igual",
   "label.login": "Iniciar sessão",
   "label.logout": "Sair",
+  "label.max": "Max",
   "label.members": "Membros",
+  "label.min": "Min",
   "label.mobile": "Celular",
   "label.more": "Mais",
+  "label.my-websites": "My websites",
   "label.name": "Nome",
   "label.new-password": "Nova senha",
   "label.none": "Nenhum",
-  "label.operating-systems": "Sistemas operacionais",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Proprietário",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Visualizações de página",
+  "label.pageTitle": "Page title",
   "label.pages": "Páginas",
   "label.password": "Senha",
   "label.powered-by": "Distribuído por {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Parâmetros de Consulta",
   "label.realtime": "Tempo real",
+  "label.referrer": "Referrer",
   "label.referrers": "Referências",
   "label.refresh": "Atualizar",
   "label.regenerate": "Regerar",
+  "label.region": "Region",
   "label.regions": "Regiões",
   "label.remove": "Remover",
   "label.reports": "Reports",
   "label.required": "Obrigatório",
   "label.reset": "Redefinir",
   "label.reset-website": "Redefinir estatísticas",
+  "label.retention": "Retention",
   "label.role": "Papel",
   "label.run-query": "Executar query",
   "label.save": "Salvar",
@@ -99,12 +132,15 @@
   "label.settings": "Configurações",
   "label.share-url": "Link de compartilhamento",
   "label.single-day": "Dia específico",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Time",
   "label.team-guest": "Convidado",
   "label.team-id": "ID do Time",
   "label.team-member": "Membro",
+  "label.team-name": "Team name",
   "label.team-owner": "Proprietário",
+  "label.team-websites": "Team websites",
   "label.teams": "Times",
   "label.theme": "Tema",
   "label.this-month": "Este mês",
@@ -114,14 +150,21 @@
   "label.title": "Título",
   "label.today": "Hoje",
   "label.toggle-charts": "Mostrar/Esconder gráficos",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Código de rastreamento",
+  "label.true": "True",
+  "label.type": "Tipo",
+  "label.unique": "Único",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconhecido",
+  "label.untitled": "Sem título",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Usuário",
   "label.username": "Nome de usuário",
   "label.users": "Usuários",
+  "label.value": "Valor",
   "label.view": "Ver",
   "label.view-details": "Ver detalhes",
   "label.view-only": "Somente visualização",
@@ -132,33 +175,6 @@
   "label.websites": "Sites",
   "label.window": "Janela",
   "label.yesterday": "Ontem",
-  "labels.after": "Depois",
-  "labels.average": "Average",
-  "labels.before": "Antes",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Criar relatório",
-  "labels.description": "Descrição",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Maior que",
-  "labels.greater-than-equals": "Maior que ou igual",
-  "labels.less-than": "Menor que",
-  "labels.less-than-equals": "Menor que ou igual",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Tipo",
-  "labels.unique": "Único",
-  "labels.untitled": "Sem título",
-  "labels.value": "Valor",
   "message.active-users": "{x} {x, plural, one {visitante} other {visitantes}} neste momento",
   "message.confirm-delete": "Deseja realmente remover {target}?",
   "message.confirm-leave": "Você tem certeza que deseja sair de {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "O nome de usuário e/ou senha está incorreto.",
   "message.invalid-domain": "Domínio inválido",
   "message.min-password-length": "Quantidade mínima de {n} caracteres",
+  "message.new-version-available": "Uma nova versão do Umami {version} está disponível!",
   "message.no-data-available": "Sem dados disponíveis.",
   "message.no-event-data": "Nenhum dado de evento está disponível.",
   "message.no-match-password": "As senhas não correspondem",
+  "message.no-results-found": "Nenhum resultado foi encontrado.",
+  "message.no-team-websites": "Este time não possui nenhum site.",
   "message.no-teams": "Você não criou nenhum time.",
   "message.no-users": "Não há nenhum usuário.",
+  "message.no-websites-configured": "Nenhum site foi configurado ainda.",
   "message.page-not-found": "Página não encontrada.",
   "message.reset-website": "Para redefinir este site, digite {confirmation} na caixa abaixo para confirmar.",
   "message.reset-website-warning": "Todas as estatísticas deste site serão removidas, mas seu código de rastreamento permanecerá intacto.",
@@ -184,12 +204,8 @@
   "message.share-url": "Este é o link público de compartilhamento para {target}.",
   "message.team-already-member": "Você já um membro do time.",
   "message.team-not-found": "Time não encontrado.",
+  "message.team-websites-info": "Os sites podem ser visualizados por qualquer membro da equipe.",
   "message.tracking-code": "Código de rastreamento",
   "message.user-deleted": "Usuário removido.",
-  "message.visitor-log": "Visitante de {country} usando {browser} no {device} {os}",
-  "message.no-results-found": "Nenhum resultado foi encontrado.",
-  "message.no-team-websites": "Este time não possui nenhum site.",
-  "message.no-websites-configured": "Nenhum site foi configurado ainda.",
-  "message.team-websites-info": "Os sites podem ser visualizados por qualquer membro da equipe.",
-  "message.new-version-available": "Uma nova versão do Umami {version} está disponível!"
+  "message.visitor-log": "Visitante de {country} usando {browser} no {device} {os}"
 }
diff --git a/lang/pt-PT.json b/lang/pt-PT.json
index 24765e7aad..fcf7ff03f2 100644
--- a/lang/pt-PT.json
+++ b/lang/pt-PT.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Adicionar website",
   "label.admin": "Administrador",
+  "label.after": "After",
   "label.all": "Todos",
   "label.all-time": "Todo o tempo",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Tempo médio de visita",
   "label.back": "Voltar",
+  "label.before": "Before",
   "label.bounce-rate": "Taxa de rejeição",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Navegadores",
   "label.cancel": "Cancelar",
   "label.change-password": "Alterar senha",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirmar senha",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Países",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Intervalo personalizado",
   "label.dashboard": "Painel",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Intervalo de datas",
+  "label.day": "Day",
   "label.default-date-range": "Intervalo de datas predefinido",
   "label.delete": "Eliminar",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Eliminar website",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Dispositivos",
   "label.dismiss": "Ignorar",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domínio",
   "label.dropoff": "Dropoff",
   "label.edit": "Editar",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Eventos",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Combinado",
   "label.filter-raw": "Dados brutos",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Língua",
@@ -61,17 +83,25 @@
   "label.last-hours": "Últimas {x} horas",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Iniciar sessão",
   "label.logout": "Sair",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Telemóvel",
   "label.more": "Mais",
+  "label.my-websites": "My websites",
   "label.name": "Nome",
   "label.new-password": "Nova senha",
   "label.none": "None",
-  "label.operating-systems": "Sistemas operativos",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Proprietário",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Visualizações da página",
+  "label.pageTitle": "Page title",
   "label.pages": "Páginas",
   "label.password": "Senha",
   "label.powered-by": "Distribuído por {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Tempo real",
+  "label.referrer": "Referrer",
   "label.referrers": "Referenciadores",
   "label.refresh": "Atualizar",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Obrigatório",
   "label.reset": "Repor",
   "label.reset-website": "Repor estatísticas",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Guardar",
@@ -99,12 +132,15 @@
   "label.settings": "Definições",
   "label.share-url": "Partilhar link",
   "label.single-day": "Dia único",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Tema",
   "label.this-month": "Este mês",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Hoje",
   "label.toggle-charts": "Alternar gráficos",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Código de rastreamento",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Visitantes únicos",
   "label.unknown": "Desconhecido",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nome de utilizador",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Ver detalhes",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {visitante} other {visitantes}} neste momento",
   "message.confirm-delete": "Tem a certeza que pretende eliminar {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Nome de utilizador/senha incorretos.",
   "message.invalid-domain": "Domínio inválido",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Sem dados disponíveis.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "As senhas não coincidem",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Não tens nenhum website configurado.",
   "message.page-not-found": "Página não encontrada.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Todas as estatísticas deste site serão eliminadas, mas o seu código de rastreamento permanecerá intacto.",
@@ -184,12 +204,8 @@
   "message.share-url": "Este é o link de partilha público para {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Código de rastreamento",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitante de {country} a usar {browser} no {device} {os}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Não tens nenhum website configurado.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitante de {country} a usar {browser} no {device} {os}"
 }
diff --git a/lang/ro-RO.json b/lang/ro-RO.json
index fa15ce24f4..43a78ecd20 100644
--- a/lang/ro-RO.json
+++ b/lang/ro-RO.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Adăugare site web",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Toate",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Timp mediu de vizitare",
   "label.back": "Înapoi",
+  "label.before": "Before",
   "label.bounce-rate": "Rata de respingere",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsere",
   "label.cancel": "Anulează",
   "label.change-password": "Schimbare parolă",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Confirmare parolă",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Țări",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Interval personalizat",
   "label.dashboard": "Tablou de bord",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Interval de date",
+  "label.day": "Day",
   "label.default-date-range": "Interval de date implicit",
   "label.delete": "Șterge",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Ștergere site web",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Dispozitive",
   "label.dismiss": "Renunță",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domeniu",
   "label.dropoff": "Dropoff",
   "label.edit": "Editare",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Evenimente",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Combinat",
   "label.filter-raw": "Brut",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Ultimele {x} ore",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Autentificare",
   "label.logout": "Iesire din cont",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobil",
   "label.more": "Mai mult",
+  "label.my-websites": "My websites",
   "label.name": "Nume",
   "label.new-password": "Parola nouă",
   "label.none": "None",
-  "label.operating-systems": "Sisteme de operare",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Vizualizări de pagină",
+  "label.pageTitle": "Page title",
   "label.pages": "Pagini",
   "label.password": "Parolă",
   "label.powered-by": "Cu sprijinul {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Realtime",
+  "label.referrer": "Referrer",
   "label.referrers": "Site-uri de proveniență",
   "label.refresh": "Reîmprospătare",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Obligatoriu",
   "label.reset": "Resetează",
   "label.reset-website": "Resetează statisticile pentru site",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Salvează",
@@ -99,12 +132,15 @@
   "label.settings": "Setări",
   "label.share-url": "Partajare URL",
   "label.single-day": "O singură zi",
+  "label.sum": "Sum",
   "label.tablet": "Tabletă",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Această lună",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Astăzi",
   "label.toggle-charts": "Schimbă graficele",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Cod de urmărire",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Vizitatori unici",
   "label.unknown": "Necunoscut",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Nume utilizator",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Vizualizare detalii",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Site-uri web",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {vizitator activ} other {vizitatori activi}}",
   "message.confirm-delete": "Sunteți sigur că doriți să ștergeți {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Nume utilizator / parolă incorecte.",
   "message.invalid-domain": "Domeniu nu este valid",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Nici o informație disponibilă.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Parolele nu se potrivesc",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Nu aveți niciun site web configurat.",
   "message.page-not-found": "Pagina nu a fost găsită.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Toate statisticile pentru acest site web vor fi șterse, dar codul de urmărire va rămâne intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "Aceasta este adresa URL de partajare pentru {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Cod de urmărire",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Vizitator din {country} folosind {browser} pe {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Nu aveți niciun site web configurat.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Vizitator din {country} folosind {browser} pe {os} {device}"
 }
diff --git a/lang/ru-RU.json b/lang/ru-RU.json
index 93bc536780..b9129beb45 100644
--- a/lang/ru-RU.json
+++ b/lang/ru-RU.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Добавить сайт",
   "label.admin": "Администратор",
+  "label.after": "After",
   "label.all": "Все",
   "label.all-time": "Все время",
   "label.analytics": "Аналитика",
+  "label.average": "Average",
   "label.average-visit-time": "Среднее время посещения",
   "label.back": "Назад",
+  "label.before": "Before",
   "label.bounce-rate": "Отказы",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Браузеры",
   "label.cancel": "Отменить",
   "label.change-password": "Изменить пароль",
   "label.cities": "Города",
+  "label.city": "City",
   "label.clear-all": "Очистить все",
   "label.confirm": "Подтвердить",
   "label.confirm-password": "Подтвердить пароль",
+  "label.contains": "Contains",
   "label.continue": "Продолжить",
   "label.countries": "Страны",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Создать команду",
   "label.create-user": "Создать пользователя",
   "label.created": "Создано",
@@ -28,16 +37,21 @@
   "label.custom-range": "Другой период",
   "label.dashboard": "Информационная панель",
   "label.data": "Данные",
+  "label.date": "Date",
   "label.date-range": "Диапазон дат",
+  "label.day": "Day",
   "label.default-date-range": "Диапазон дат по-умолчанию",
   "label.delete": "Удалить",
   "label.delete-team": "Удалить команду",
   "label.delete-user": "Удалить пользователя",
   "label.delete-website": "Удалить сайт",
+  "label.description": "Description",
   "label.desktop": "Настольный компьютер",
   "label.details": "Подробности",
+  "label.device": "Device",
   "label.devices": "Устройства",
   "label.dismiss": "Отклонить",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Домен",
   "label.dropoff": "Dropoff",
   "label.edit": "Изменить",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "События",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Объединенные",
   "label.filter-raw": "Сырые данные",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Присоединиться",
   "label.join-team": "Присоединиться к команде",
   "label.language": "Язык",
@@ -61,17 +83,25 @@
   "label.last-hours": "Последние {x} часа",
   "label.leave": "Уйти",
   "label.leave-team": "Покинуть команду",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Войти",
   "label.logout": "Выйти",
+  "label.max": "Max",
   "label.members": "Участники",
+  "label.min": "Min",
   "label.mobile": "Смартфон",
   "label.more": "Больше",
+  "label.my-websites": "My websites",
   "label.name": "Имя",
   "label.new-password": "Новый пароль",
   "label.none": "Не указано",
-  "label.operating-systems": "Операционные системы",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Владелец",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Просмотры страниц",
+  "label.pageTitle": "Page title",
   "label.pages": "Страницы",
   "label.password": "Пароль",
   "label.powered-by": "На движке {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Параметры запроса",
   "label.realtime": "Реальное время",
+  "label.referrer": "Referrer",
   "label.referrers": "Источники",
   "label.refresh": "Обновить",
   "label.regenerate": "Обновить",
+  "label.region": "Region",
   "label.regions": "Регионы",
   "label.remove": "Удалить",
   "label.reports": "Reports",
   "label.required": "Обязательное",
   "label.reset": "Сбросить",
   "label.reset-website": "Сбросить статистику",
+  "label.retention": "Retention",
   "label.role": "Роль",
   "label.run-query": "Run query",
   "label.save": "Сохранить",
@@ -99,12 +132,15 @@
   "label.settings": "Настройки",
   "label.share-url": "Поделиться ссылкой",
   "label.single-day": "Один день",
+  "label.sum": "Sum",
   "label.tablet": "Планшет",
   "label.team": "Команда",
   "label.team-guest": "Гость команды",
   "label.team-id": "ID команды",
   "label.team-member": "Член команды",
+  "label.team-name": "Team name",
   "label.team-owner": "Владелец команды",
+  "label.team-websites": "Team websites",
   "label.teams": "Команды",
   "label.theme": "Тема",
   "label.this-month": "Этот месяц",
@@ -114,14 +150,21 @@
   "label.title": "Заголовок",
   "label.today": "Сегодня",
   "label.toggle-charts": "Показать/скрыть графики",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Код отслеживания",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Уникальные посетители",
   "label.unknown": "Неизвестно",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Пользователь",
   "label.username": "Имя пользователя",
   "label.users": "Пользователи",
+  "label.value": "Value",
   "label.view": "Просмотреть",
   "label.view-details": "Посмотреть детали",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Сайты",
   "label.window": "Window",
   "label.yesterday": "Вчера",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} текущих посетителей",
   "message.confirm-delete": "Вы уверены, что хотите удалить {target}?",
   "message.confirm-leave": "Вы уверены, что хотите уйти {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Неверное имя пользователя/пароль.",
   "message.invalid-domain": "Некорректный домен",
   "message.min-password-length": "Минимальная длина {n} символов",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Нет данных.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Пароли не совпадают",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "У этой команды нет ни одного сайта.",
   "message.no-teams": "Вы не создали ни одной команды.",
   "message.no-users": "Нет пользователей.",
+  "message.no-websites-configured": "У вас нет настроенных сайтов.",
   "message.page-not-found": "Страница не найдена.",
   "message.reset-website": "Для сброса введите RESET",
   "message.reset-website-warning": "Вся статистика для этого сайта будет удалена, но ваш код отслеживания останется нетронутым.",
@@ -184,12 +204,8 @@
   "message.share-url": "Это публичная ссылка для {target}.",
   "message.team-already-member": "Вы уже состоите в команде.",
   "message.team-not-found": "Команда не найдена.",
+  "message.team-websites-info": "Сайты могут просматривать все члены команды.",
   "message.tracking-code": "Код отслеживания",
   "message.user-deleted": "Пользователь удален.",
-  "message.visitor-log": "Посетитель из {country} используя {browser} на {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "У этой команды нет ни одного сайта.",
-  "message.no-websites-configured": "У вас нет настроенных сайтов.",
-  "message.team-websites-info": "Сайты могут просматривать все члены команды.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Посетитель из {country} используя {browser} на {os} {device}"
 }
diff --git a/lang/si-LK.json b/lang/si-LK.json
index 086c156ea2..6f6dda6d1c 100644
--- a/lang/si-LK.json
+++ b/lang/si-LK.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "වෙබ් අඩවිය එක් කරන්න",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "සියල්ල",
   "label.all-time": "හැම වෙලාවෙම",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Average visit time",
   "label.back": "ආපසු",
+  "label.before": "Before",
   "label.bounce-rate": "Bounce rate",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Browsers",
   "label.cancel": "අවලංගු කරන්න",
   "label.change-password": "මුරපදය වෙනස් කරන්න",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "මුරපදය සත්‍යාපනය කරන්න",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Countries",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "අභිරුචි පරාසය",
   "label.dashboard": "උපකරණ පුවරුව",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "දින පරාසය",
+  "label.day": "Day",
   "label.default-date-range": "පෙරනිමි දින පරාසය",
   "label.delete": "මකන්න",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "වෙබ් අඩවිය මකන්න",
+  "label.description": "Description",
   "label.desktop": "Desktop",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Devices",
   "label.dismiss": "මගහරින්න",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "වසම",
   "label.dropoff": "Dropoff",
   "label.edit": "සංස්කරණය කරන්න",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "සිදුවීම් දත්ත",
   "label.events": "Events",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Combined",
   "label.filter-raw": "Raw",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "භාෂාව",
@@ -61,17 +83,25 @@
   "label.last-hours": "අන්තිම {x} පැය",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "ලොග් වෙන්න",
   "label.logout": "පිටවීම",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobile",
   "label.more": "තවත්",
+  "label.my-websites": "My websites",
   "label.name": "නම",
   "label.new-password": "අලුත් මුරපදය",
   "label.none": "කිසිවක් නැත",
-  "label.operating-systems": "Operating systems",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "හිමිකරු",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Page views",
+  "label.pageTitle": "Page title",
   "label.pages": "Pages",
   "label.password": "මුරපදය",
   "label.powered-by": "Powered by {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "තත්ය කාල",
+  "label.referrer": "Referrer",
   "label.referrers": "Referrers",
   "label.refresh": "නැවුම් කරන්න",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "අවශ්‍යයි",
   "label.reset": "යළි පිහිටුවන්න",
   "label.reset-website": "සංඛ්යා ලේඛන නැවත සකසන්න",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "සුරකින්න",
@@ -99,12 +132,15 @@
   "label.settings": "සැකසුම්",
   "label.share-url": "බෙදාගැනීමේ URL",
   "label.single-day": "තනි දවස",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "තේමාව",
   "label.this-month": "මෙ මාසය",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "අද",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "ලුහුබැඳීමේ කේතය",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unique visitors",
   "label.unknown": "නොදනී",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "පරිශීලක නාමය",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "තොරතුරු පෙන්වන්න",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "වෙබ් අඩවි",
   "label.window": "Window",
   "label.yesterday": "ඊයේ",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} දැන් {x, plural, one {අමුත්තා} other {අමුත්තන්}}",
   "message.confirm-delete": "{target} මකා දැමීම ගැන විශ්වාසද?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "වැරදි පරිශීලක නාමය/මුරපදය.",
   "message.invalid-domain": "Invalid domain. Do not include http/https.",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "පෙන්වීමට දත්ත නොමැත.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Passwords do not match.",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "You do not have any websites configured.",
   "message.page-not-found": "පිටුව හමු නොවීය.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your settings will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "මේ {target} සඳහා ප්‍රසිද්ධියේ බෙදාගත් URL එකයි.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "To track stats for this website, place the following code in the <head>...</head> section of your HTML.",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "You do not have any websites configured.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Visitor from {country} using {browser} on {os} {device}"
 }
diff --git a/lang/sk-SK.json b/lang/sk-SK.json
index 884519aacc..3f03392360 100644
--- a/lang/sk-SK.json
+++ b/lang/sk-SK.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Pridať web",
   "label.admin": "Administrátor",
+  "label.after": "After",
   "label.all": "Všetko",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Priemerný čas návštevy",
   "label.back": "Späť",
+  "label.before": "Before",
   "label.bounce-rate": "Okamžité opustenie",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Prehliadač",
   "label.cancel": "Zrušiť",
   "label.change-password": "Zmeniť heslo",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Potvrdiť heslo",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Zem",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Vlastný rozsah",
   "label.dashboard": "Prehlad",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Obdobie",
+  "label.day": "Day",
   "label.default-date-range": "Predvolené obdobie",
   "label.delete": "Zmazať",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Zmazať web",
+  "label.description": "Description",
   "label.desktop": "Stolný počítač",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Zariadenie",
   "label.dismiss": "Odísť",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Doména",
   "label.dropoff": "Dropoff",
   "label.edit": "Upraviť",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Udalosti",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Kombinácie",
   "label.filter-raw": "Nezpracované",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Posledných {x} hodín",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Prihlásiť",
   "label.logout": "Odhlásiť",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobilný telefon",
   "label.more": "Viac",
+  "label.my-websites": "My websites",
   "label.name": "Meno",
   "label.new-password": "Nové heslo",
   "label.none": "None",
-  "label.operating-systems": "Operačný systém",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Zobrazenie stánok",
+  "label.pageTitle": "Page title",
   "label.pages": "Stránky",
   "label.password": "Heslo",
   "label.powered-by": "Powered by {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Aktuálne",
+  "label.referrer": "Referrer",
   "label.referrers": "Odkazy",
   "label.refresh": "Obnoviť",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Povinné",
   "label.reset": "Reset",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Uložiť",
@@ -99,12 +132,15 @@
   "label.settings": "Nastavenia",
   "label.share-url": "Zdielanie URL",
   "label.single-day": "Jeden deň",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Tento mesiac",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Dnes",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Sledovací kód",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Jedinečné návštevy",
   "label.unknown": "Neznámý",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Užívateľské meno",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Zobraziť detaily",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Weby",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} aktuálne {x, plural, one {návštevník} other {návštěvníci}}",
   "message.confirm-delete": "Naozaj zmazať {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Nesprávné meno/heslo.",
   "message.invalid-domain": "Neplatná doména",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Žiadne data.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Hesla se nezhodujú",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Nemáte nastavený žiadny web.",
   "message.page-not-found": "Stránka sa nenašla.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "Toto je zdielané URL pre {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Sledovací kód",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Návštevník z {country} s prehliadačom {browser} na {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Nemáte nastavený žiadny web.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Návštevník z {country} s prehliadačom {browser} na {os} {device}"
 }
diff --git a/lang/sl-SI.json b/lang/sl-SI.json
index ab309ab9d5..aae7888d87 100644
--- a/lang/sl-SI.json
+++ b/lang/sl-SI.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Dodaj spletno mesto",
   "label.admin": "Administrator",
+  "label.after": "After",
   "label.all": "Vse",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Povprečni čas obiska",
   "label.back": "Nazaj",
+  "label.before": "Before",
   "label.bounce-rate": "Zapustna stopnja",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Brskalniki",
   "label.cancel": "Prekliči",
   "label.change-password": "Zamenjaj geslo",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Potrditev gesla",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Države",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Razpon po meri",
   "label.dashboard": "Nadzorna plošča",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Časovni razpon",
+  "label.day": "Day",
   "label.default-date-range": "Privzeti časovni razpon",
   "label.delete": "Izbriši",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Izbriši spletno mesto",
+  "label.description": "Description",
   "label.desktop": "Namizni računalnik",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Naprave",
   "label.dismiss": "Opusti",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domena",
   "label.dropoff": "Dropoff",
   "label.edit": "Uredi",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Dogodki",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Skupno",
   "label.filter-raw": "Neobdelane meritve",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Zadnjih {x} ur",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Prijava",
   "label.logout": "Odjava",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobilni telefon",
   "label.more": "Več",
+  "label.my-websites": "My websites",
   "label.name": "Ime",
   "label.new-password": "Novo geslo",
   "label.none": "None",
-  "label.operating-systems": "Operacijski sistemi",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Ogledi strani",
+  "label.pageTitle": "Page title",
   "label.pages": "Strani",
   "label.password": "Geslo",
   "label.powered-by": "Zagotavlja {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "V realnem času",
+  "label.referrer": "Referrer",
   "label.referrers": "Viri",
   "label.refresh": "Osveži",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Zahtevano",
   "label.reset": "Ponastavi",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Shrani",
@@ -99,12 +132,15 @@
   "label.settings": "Nastavitve",
   "label.share-url": "Deli URL",
   "label.single-day": "En dan",
+  "label.sum": "Sum",
   "label.tablet": "Tablični računalnik",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Ta mesec",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Danes",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Koda za sledenje",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unikatni obiskovalci",
   "label.unknown": "Neznano",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Uporabniško ime",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Prikaži podrobnosti",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Spletna mesta",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} trenutni {x, plural, one {obiskovalec} other {obiskovalcev}}",
   "message.confirm-delete": "Ste prepričani, da želite izbrisati {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Nepravilno uporabniško ime/geslo",
   "message.invalid-domain": "Neveljavna domena",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Podatki niso na voljo.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Gesli se ne ujemata",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Ni nastavljenih spletnih mest.",
   "message.page-not-found": "Stran ni bila najdena.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "To je javno dostopen naslov URL za {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Koda za sledenje",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Obiskovalec iz {country} uporablja {browser} na {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Ni nastavljenih spletnih mest.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Obiskovalec iz {country} uporablja {browser} na {os} {device}"
 }
diff --git a/lang/sv-SE.json b/lang/sv-SE.json
index 3e1303c58f..e6abb5bf74 100644
--- a/lang/sv-SE.json
+++ b/lang/sv-SE.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Lägg till webbsajt",
   "label.admin": "Administratör",
+  "label.after": "After",
   "label.all": "Alla",
   "label.all-time": "Sedan början",
   "label.analytics": "Analys",
+  "label.average": "Average",
   "label.average-visit-time": "Medelbesökstid",
   "label.back": "Tillbaka",
+  "label.before": "Before",
   "label.bounce-rate": "Avvisningfrekvens",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Webbläsare",
   "label.cancel": "Avbryt",
   "label.change-password": "Byt lösenord",
   "label.cities": "Städer",
+  "label.city": "City",
   "label.clear-all": "Rensa alla",
   "label.confirm": "Bekräfta",
   "label.confirm-password": "Bekräfta lösenord",
+  "label.contains": "Contains",
   "label.continue": "Fortsätt",
   "label.countries": "Länder",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Skapa team",
   "label.create-user": "Skapa användare",
   "label.created": "Skapad",
@@ -28,16 +37,21 @@
   "label.custom-range": "Anpassat urval",
   "label.dashboard": "Översikt",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Datumomfång",
+  "label.day": "Day",
   "label.default-date-range": "Standard datum-urval",
   "label.delete": "Radera",
   "label.delete-team": "Radera team",
   "label.delete-user": "Radera användare",
   "label.delete-website": "Radera webbsajt",
+  "label.description": "Description",
   "label.desktop": "Stationär",
   "label.details": "Detailjer",
+  "label.device": "Device",
   "label.devices": "Enheter",
   "label.dismiss": "Avbryt",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Domän",
   "label.dropoff": "Dropoff",
   "label.edit": "Redigera",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Händelser",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Kombinerade",
   "label.filter-raw": "Rådata",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Gå med",
   "label.join-team": "gå med i team",
   "label.language": "Språk",
@@ -61,17 +83,25 @@
   "label.last-hours": "Senaste {x} timmarna",
   "label.leave": "Lämna",
   "label.leave-team": "Lämna team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Logga in",
   "label.logout": "Logga ut",
+  "label.max": "Max",
   "label.members": "Medlemmar",
+  "label.min": "Min",
   "label.mobile": "Mobil",
   "label.more": "Mer",
+  "label.my-websites": "My websites",
   "label.name": "Namn",
   "label.new-password": "Nytt lösenord",
   "label.none": "Inga",
-  "label.operating-systems": "Operativsystem",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Ägare",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Sidvisningar",
+  "label.pageTitle": "Page title",
   "label.pages": "Sidor",
   "label.password": "Lösenord",
   "label.powered-by": "Drivs av {name}",
@@ -80,15 +110,18 @@
   "label.query": "Frågor",
   "label.query-parameters": "Fråge-parametrar",
   "label.realtime": "Realtid",
+  "label.referrer": "Referrer",
   "label.referrers": "Hänvisare",
   "label.refresh": "Uppdatera",
   "label.regenerate": "Regenerera",
+  "label.region": "Region",
   "label.regions": "Regioner",
   "label.remove": "Ta bort",
   "label.reports": "Reports",
   "label.required": "Krävs",
   "label.reset": "Återställ",
   "label.reset-website": "Återställ statistik",
+  "label.retention": "Retention",
   "label.role": "Roll",
   "label.run-query": "Run query",
   "label.save": "Spara",
@@ -99,12 +132,15 @@
   "label.settings": "Inställningar",
   "label.share-url": "Delnings-URL",
   "label.single-day": "En dag",
+  "label.sum": "Sum",
   "label.tablet": "Platta",
   "label.team": "Team",
   "label.team-guest": "Team-gäst",
   "label.team-id": "Team ID",
   "label.team-member": "Team-medlem",
+  "label.team-name": "Team name",
   "label.team-owner": "Team-ägare",
+  "label.team-websites": "Team websites",
   "label.teams": "Team",
   "label.theme": "Tema",
   "label.this-month": "Denna månad",
@@ -114,14 +150,21 @@
   "label.title": "Titel",
   "label.today": "Idag",
   "label.toggle-charts": "Visa/göm grafer",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Spårningskod",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Unika besökare",
   "label.unknown": "Okänd",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Användare",
   "label.username": "Användarnamn",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "Visa",
   "label.view-details": "Visa detaljer",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Webbsajt",
   "label.window": "Window",
   "label.yesterday": "Igår",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} {x, plural, one {besökare} other {besökare}} just nu",
   "message.confirm-delete": "Är du säker på att du vill radera {target}?",
   "message.confirm-leave": "Är du säker på att du vill lämna {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Felaktigt användarnamn/lösenord.",
   "message.invalid-domain": "Ogiltig domän",
   "message.min-password-length": "Minst {n} tecken",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Ingen data tillgänglig.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Lösenorden är inte samma",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "Det här teamet har inga webbsajter.",
   "message.no-teams": "Du har inte skapat några team.",
   "message.no-users": "Det finns inga användare.",
+  "message.no-websites-configured": "Du har inga webbsajter.",
   "message.page-not-found": "Sidan kan inte hittas.",
   "message.reset-website": "För att återställa statistiken skriv {confirmation} i rutan nedan.",
   "message.reset-website-warning": "All statistik för webbsajten tas bort men spårningskoden förblir oförändrad.",
@@ -184,12 +204,8 @@
   "message.share-url": "Det här är den offentliga delnings-URL:en för {target}.",
   "message.team-already-member": "Du är redan medlem i teamet.",
   "message.team-not-found": "Team kan inte hittas.",
+  "message.team-websites-info": "Websajter kan ses av alla i teamet.",
   "message.tracking-code": "Spårningskod",
   "message.user-deleted": "Användare raderad.",
-  "message.visitor-log": "Besökare från {country} med {browser} på {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "Det här teamet har inga webbsajter.",
-  "message.no-websites-configured": "Du har inga webbsajter.",
-  "message.team-websites-info": "Websajter kan ses av alla i teamet.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Besökare från {country} med {browser} på {os} {device}"
 }
diff --git a/lang/ta-IN.json b/lang/ta-IN.json
index e52bf186f9..be3d5e8154 100644
--- a/lang/ta-IN.json
+++ b/lang/ta-IN.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "வலைத்தளத்தைச் சேர்க்க",
   "label.admin": "நிர்வாகியைச் சேர்க்க",
+  "label.after": "After",
   "label.all": "எல்லாம்",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "சராசரி வருகை நேரம்",
   "label.back": "பின்னால்",
+  "label.before": "Before",
   "label.bounce-rate": "துள்ளல் விகிதம்",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "உலாவிகள்",
   "label.cancel": "ரத்துசெய்",
   "label.change-password": "கடவுச்சொல்லை மாற்று",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "கடவுச்சொல்லை உறுதிப்படுத்தவும்",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "நாடுகள்",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "தனிப்பயன் வேறுபாட்டெல்லை",
   "label.dashboard": "முகப்பு",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "தேதி வரம்பு",
+  "label.day": "Day",
   "label.default-date-range": "இயல்புநிலை தேதி வரம்பு",
   "label.delete": "அழி",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "வலைத்தளத்தை நீக்கு",
+  "label.description": "Description",
   "label.desktop": "மேசை கணினி",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "சாதனங்கள்",
   "label.dismiss": "நீக்கு",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "கள முகவரி",
   "label.dropoff": "Dropoff",
   "label.edit": "திருத்துதல்",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "நிகழ்வுகள்",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "ஒருங்கிணைந்த",
   "label.filter-raw": "மூல",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "முந்தைய {x} மணி",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "உள்நுழைய",
   "label.logout": "வெளியேறு",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "கைபேசி",
   "label.more": "மேலும்",
+  "label.my-websites": "My websites",
   "label.name": "பெயர்",
   "label.new-password": "புதிய கடவுச்சொல்",
   "label.none": "None",
-  "label.operating-systems": "இயக்க முறைமைகள்",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "பக்க காட்சிகள்",
+  "label.pageTitle": "Page title",
   "label.pages": "பக்கங்கள்",
   "label.password": "கடவுச்சொல்",
   "label.powered-by": "{name} ஆல் இயக்கப்படுகிறது",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "தற்போதைய",
+  "label.referrer": "Referrer",
   "label.referrers": "குறிப்பிடுவோர்",
   "label.refresh": "புதுப்பிப்பு",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "தேவையானவை",
   "label.reset": "மீட்டமை",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "சேமி",
@@ -99,12 +132,15 @@
   "label.settings": "அமைப்புகள்",
   "label.share-url": "வலைத்தள களத்தைப் பகிரவும்",
   "label.single-day": "ஒரு நாள்",
+  "label.sum": "Sum",
   "label.tablet": "கையடக்க கணினி",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "இந்த மாதம்",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "இன்று",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "கண்காணிப்பு குறியீடு",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "தனிப்பட்ட பார்வையாளர்கள்",
   "label.unknown": "தெரியாத",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "பயனர்பெயர்",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "விபரங்களை பார்",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "வலைத்தளங்கள்",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} தற்போதைய {x, plural, one {ஒன்று} other {மற்ற}}",
   "message.confirm-delete": "நீங்கள் நிச்சயமாக {target} நீக்க விரும்புகிறீர்களா?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "தவறான பயனர்பெயர் / கடவுச்சொல்.",
   "message.invalid-domain": "தவறான கள முகவரி",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "தரவு எதுவும் கிடைக்கவில்லை.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "இருக்கடவுச்சொல் பொருந்தவில்லை",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "உங்களிடம் எந்த வலைத்தளங்களும் கட்டமைக்கப்படவில்லை.",
   "message.page-not-found": "பக்கம் கிடைக்கவில்லை.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "{target} இது பொதுவில் பகிரும் வலைத்தள முகவரி.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "கண்காணிப்பு குறியீடு",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{country}வில் இருந்து பார்வையாளர் {browser} ஐ {os} {device}லில் பயன்படுத்துகிறார்",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "உங்களிடம் எந்த வலைத்தளங்களும் கட்டமைக்கப்படவில்லை.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{country}வில் இருந்து பார்வையாளர் {browser} ஐ {os} {device}லில் பயன்படுத்துகிறார்"
 }
diff --git a/lang/th-TH.json b/lang/th-TH.json
index 7fa70298f1..43f2f75878 100644
--- a/lang/th-TH.json
+++ b/lang/th-TH.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "เพิ่มเว็บไซต์",
   "label.admin": "ผู้ดูแลระบบ",
+  "label.after": "After",
   "label.all": "ทั้งหมด",
   "label.all-time": "ทุกช่วงเวลา",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "ระยะเวลาเข้าชมเฉลี่ย",
   "label.back": "ย้อนกลับ",
+  "label.before": "Before",
   "label.bounce-rate": "อัตราตีกลับ",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "เบราว์เซอร์",
   "label.cancel": "ยกเลิก",
   "label.change-password": "เปลี่ยนรหัสผ่าน",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "ยืนยันรหัสผ่าน",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "ประเทศ",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "กำหนดช่วงเวลา",
   "label.dashboard": "แดชบอร์ด",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "ตั้งแต่วันที่",
+  "label.day": "Day",
   "label.default-date-range": "ช่วงเวลา",
   "label.delete": "ลบ",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "ลบเว็บไซต์",
+  "label.description": "Description",
   "label.desktop": "เดสก์ท็อป",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "อุปกรณ์",
   "label.dismiss": "ยกเลิก",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "โดเมน",
   "label.dropoff": "Dropoff",
   "label.edit": "แก้ไข",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "เหตุการณ์",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "ข้อมูลรวม",
   "label.filter-raw": "ข้อมูลดิบ",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "ภาษา",
@@ -61,17 +83,25 @@
   "label.last-hours": "{x} ชั่วโมงที่ผ่านมา",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "เข้าสู่ระบบ",
   "label.logout": "ออกจากระบบ",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "โทรศัพท์มือถือ",
   "label.more": "เพิ่มเติม",
+  "label.my-websites": "My websites",
   "label.name": "ชื่อ",
   "label.new-password": "รหัสผ่านใหม่",
   "label.none": "ไม่ได้กำหนด",
-  "label.operating-systems": "ระบบปฏิบัติการ",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "เจ้าของ",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "การเข้าชม",
+  "label.pageTitle": "Page title",
   "label.pages": "หน้าเพจ",
   "label.password": "รหัสผ่าน",
   "label.powered-by": "ขับเคลื่อนโดย {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "เรียลไทม์",
+  "label.referrer": "Referrer",
   "label.referrers": "แหล่งที่มา",
   "label.refresh": "รีเฟรช",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "ต้องการ",
   "label.reset": "รีเซต",
   "label.reset-website": "รีเซตข้อมูลสถิติ",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "บันทึก",
@@ -99,12 +132,15 @@
   "label.settings": "ตั้งค่า",
   "label.share-url": "แชร์ลิงก์",
   "label.single-day": "วันที่",
+  "label.sum": "Sum",
   "label.tablet": "แท็บเล็ต",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "ธีม",
   "label.this-month": "เดือนปัจจุบัน",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "วันนี้",
   "label.toggle-charts": "เปิด/ปิดแผนภูมิ",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "โค้ดสำหรับใช้ติดตาม",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "ผู้เข้าชม",
   "label.unknown": "ไม่รู้จัก",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "ชื่อผู้ใช้",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "แสดงรายละเอียด",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "เว็บไซต์",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "มีผู้ใช้งาน {x} {x, plural, one {คนในขณะนี้} other {คนในขณะนี้}}",
   "message.confirm-delete": "คุณแน่ใจหรือไม่ว่าต้องการลบ {target} ?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง.",
   "message.invalid-domain": "โดเมนไม่ถูกต้อง",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "ไม่มีข้อมูล.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "รหัสผ่านไม่ตรงกัน",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "คุณยังไม่ได้ตั้งค่าเว็บไซต์ใด ๆ ไว้.",
   "message.page-not-found": "ไม่พบหน้านี้.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "สถิติทั้งหมดสำหรับเว็บไซต์นี้จะถูกลบออก แต่โค้ดสำหรับใช้ติดตามของคุณจะยังคงอยู่เหมือนเดิม.",
@@ -184,12 +204,8 @@
   "message.share-url": "นี่คือลิงก์ที่แชร์แบบสาธารณะสำหรับ {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "โค้ดสำหรับใช้ติดตาม",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "ผู้เข้าชมจาก {country} กำลังใช้งานผ่าน {browser} บน {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "คุณยังไม่ได้ตั้งค่าเว็บไซต์ใด ๆ ไว้.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "ผู้เข้าชมจาก {country} กำลังใช้งานผ่าน {browser} บน {os} {device}"
 }
diff --git a/lang/tr-TR.json b/lang/tr-TR.json
index 4f39fcb3fe..0ec10e0b93 100644
--- a/lang/tr-TR.json
+++ b/lang/tr-TR.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Web sitesi ekle",
   "label.admin": "Yönetici",
+  "label.after": "After",
   "label.all": "Tümü",
   "label.all-time": "All time",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Ortalama ziyaret süresi",
   "label.back": "Geri",
+  "label.before": "Before",
   "label.bounce-rate": "Çıkma oranı",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Tarayıcılar",
   "label.cancel": "İptal",
   "label.change-password": "Şifre değiştir",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Parolayı onayla",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Ülkeler",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Özelleştirilmiş aralık",
   "label.dashboard": "Kontrol Paneli",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Tarih aralığı",
+  "label.day": "Day",
   "label.default-date-range": "Varsayılan tarih aralığı",
   "label.delete": "Sil",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Web sitesini sil",
+  "label.description": "Description",
   "label.desktop": "Masaüstü",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Cihazlar",
   "label.dismiss": "Reddet",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Alan adı",
   "label.dropoff": "Dropoff",
   "label.edit": "Düzenle",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Olaylar",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Birleşik",
   "label.filter-raw": "Ham",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Son {x} saat",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Giriş Yap",
   "label.logout": "Çıkış Yap",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Mobil Cihaz",
   "label.more": "Detaylı göster",
+  "label.my-websites": "My websites",
   "label.name": "İsim",
   "label.new-password": "Yeni parola",
   "label.none": "None",
-  "label.operating-systems": "İşletim sistemi",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Owner",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Sayfa görünümü",
+  "label.pageTitle": "Page title",
   "label.pages": "Sayfalar",
   "label.password": "Parola",
   "label.powered-by": "Sağlayıcı: {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Gerçek Zamanlı",
+  "label.referrer": "Referrer",
   "label.referrers": "Yönlendirenler",
   "label.refresh": "Yenile",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Zorunlu alan",
   "label.reset": "Sıfırla",
   "label.reset-website": "Reset statistics",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Kaydet",
@@ -99,12 +132,15 @@
   "label.settings": "Ayarlar",
   "label.share-url": "Paylaşım adresi",
   "label.single-day": "Tekil gün",
+  "label.sum": "Sum",
   "label.tablet": "Tablet",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Bu ay",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Bugün",
   "label.toggle-charts": "Toggle charts",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "İzleme kodu",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Tekil kullanıcı",
   "label.unknown": "Bilinmeyen",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Kullanıcı adı",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Detayı incele",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Web siteleri",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} aktif ziyaretçi",
   "message.confirm-delete": "{target} kaydını silmek istediğinizden emin misiniz?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Hatalı kullanıcı adı ya da parola.",
   "message.invalid-domain": "Geçersiz alan adı",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Henüz hiç veri yok.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Parolalar uyuşmuyor",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
   "message.page-not-found": "Sayfa bulunamadı.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.",
@@ -184,12 +204,8 @@
   "message.share-url": "{target} için kullanılabilir anonim paylaşım adresidir.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "İzleme kodu",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Yeni ziyaretçi: {country}, {os}, {device}, {browser}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Henüz hiç web sitesi tanımlamadınız",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Yeni ziyaretçi: {country}, {os}, {device}, {browser}"
 }
diff --git a/lang/uk-UA.json b/lang/uk-UA.json
index 7bdffd177b..89079eff2c 100644
--- a/lang/uk-UA.json
+++ b/lang/uk-UA.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Додати сайт",
   "label.admin": "Адміністратор",
+  "label.after": "After",
   "label.all": "Всі",
   "label.all-time": "Весь час",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Середній час візиту",
   "label.back": "Назад",
+  "label.before": "Before",
   "label.bounce-rate": "Показник відмов",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Браузери",
   "label.cancel": "Відмінити",
   "label.change-password": "Змінити пароль",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Підтвердити пароль",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Країни",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Довільний період",
   "label.dashboard": "Інформаційна панель",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Діапазон дат",
+  "label.day": "Day",
   "label.default-date-range": "Діапазон дат за замовчуванням",
   "label.delete": "Видалити",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Видалити сайт",
+  "label.description": "Description",
   "label.desktop": "Настільний ПК",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Пристрої",
   "label.dismiss": "Відхилити",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Домен",
   "label.dropoff": "Dropoff",
   "label.edit": "Редагувати",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Події",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Об'єднані",
   "label.filter-raw": "Сирі дані",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "Останні {x} годин",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Увійти",
   "label.logout": "Вийти",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Мобільний",
   "label.more": "Більше",
+  "label.my-websites": "My websites",
   "label.name": "Ім'я",
   "label.new-password": "Новий пароль",
   "label.none": "None",
-  "label.operating-systems": "Операційні системи",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Власник",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Перегляди сторінок",
+  "label.pageTitle": "Page title",
   "label.pages": "Сторінки",
   "label.password": "Пароль",
   "label.powered-by": "На базі {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "У реальному часі",
+  "label.referrer": "Referrer",
   "label.referrers": "Джерела",
   "label.refresh": "Оновити",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Обов'язкове",
   "label.reset": "Скинути",
   "label.reset-website": "Скинути статистику сайту",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Зберегти",
@@ -99,12 +132,15 @@
   "label.settings": "Налаштування",
   "label.share-url": "Поділитися посилання",
   "label.single-day": "Один день",
+  "label.sum": "Sum",
   "label.tablet": "Планшет",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "Цього місяця",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Сьогодні",
   "label.toggle-charts": "Переключити графіки",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Код для відслідковування",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Унікальні відвідувачі",
   "label.unknown": "Невідомо",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Ім'я користувача",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Переглянути деталі",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Сайти",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} поточних відвідувачів",
   "message.confirm-delete": "Ви впевнені, що бажаєте видалити {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Невірне ім'я користувача або пароль.",
   "message.invalid-domain": "Некоректний домен",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Немає даних.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Паролі не співпадають",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "У вас немає налаштованих сайтів.",
   "message.page-not-found": "Сторінку не знайдено.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Вся статистика для цього сайту буде видалена, проте код відслідковування буде продовжувати працювати.",
@@ -184,12 +204,8 @@
   "message.share-url": "Це публічне посилання для {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Код для відслідковування",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Відвідувач з {country} використовуючи {browser} на {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "У вас немає налаштованих сайтів.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Відвідувач з {country} використовуючи {browser} на {os} {device}"
 }
diff --git a/lang/ur-PK.json b/lang/ur-PK.json
index a10594d994..4d585dcbc0 100644
--- a/lang/ur-PK.json
+++ b/lang/ur-PK.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "ویب سائٹ کا اضافہ کریں",
   "label.admin": "منتظم",
+  "label.after": "After",
   "label.all": "تمام",
   "label.all-time": "تمام وقت",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "وزٹ کا اوسط وقت",
   "label.back": "پیچھے",
+  "label.before": "Before",
   "label.bounce-rate": "اچھال کی شرح",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "براؤزرز",
   "label.cancel": "منسوخ",
   "label.change-password": "پاس ورڈ تبدیل کریں",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "پاس ورڈ کی تصدیق کریں",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "ممالک",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "اپنی مرضی کی حد",
   "label.dashboard": "ڈیش بورڈ",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "تاریخ کی حد",
+  "label.day": "Day",
   "label.default-date-range": "پہلے سے طے شدہ تاریخ کی حد",
   "label.delete": "حذف کریں",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "ویب سائٹ مٹایں",
+  "label.description": "Description",
   "label.desktop": "ڈیسک ٹاپ",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "آلات",
   "label.dismiss": "مسترد کریں",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "ڈومین",
   "label.dropoff": "Dropoff",
   "label.edit": "ترمیم",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "واقعات",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "مشترکہ",
   "label.filter-raw": "خام",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "پچھلے {x} گھنٹے",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "لاگ ان",
   "label.logout": "لاگ آوٹ",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "موبائل",
   "label.more": "مزید",
+  "label.my-websites": "My websites",
   "label.name": "نام",
   "label.new-password": "نیا پاس ورڈ",
   "label.none": "None",
-  "label.operating-systems": "آپریٹنگ سسٹمز",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "مالک",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "صفحہ کے نظارے",
+  "label.pageTitle": "Page title",
   "label.pages": "صفحات",
   "label.password": "پاس ورڈ",
   "label.powered-by": "تقویت یافتہ بذریعہ {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "براہ راست",
+  "label.referrer": "Referrer",
   "label.referrers": "بھیجنے والے",
   "label.refresh": "تازہ دم کریں",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "درکار ہے",
   "label.reset": "دوبارہ ترتیب دیں",
   "label.reset-website": "اعدادوشمار کو دوبارہ ترتیب دیں",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "محفوظ کریں",
@@ -99,12 +132,15 @@
   "label.settings": "ترتیبات",
   "label.share-url": "URL کا اشتراک کریں",
   "label.single-day": "ایک دن",
+  "label.sum": "Sum",
   "label.tablet": "ٹیبلیٹ",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Theme",
   "label.this-month": "اس مہینے",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "آج",
   "label.toggle-charts": "چارٹ تبدیل کریں",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "ٹریکنگ کوڈ",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "منفرد زائرین",
   "label.unknown": "نامعلوم",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "صارف نام",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "تفصیلات دیکھیں",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "ویب سائٹس",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} موجودہ {x, plural, one {زائر} other {زائرین}}",
   "message.confirm-delete": "کیا آپ واقعی {target} کو حذف کرنا چاہتے ہیں؟",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "غلط صارف نام/پاس ورڈ۔",
   "message.invalid-domain": "غلط ڈومین",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "مواد موجود نہیں ہے.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "پاس ورڈز مماثل نہیں ہیں",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "آپ کے پاس کوئی ویب سائٹ کنفیگر نہیں ہے۔",
   "message.page-not-found": "صفحہ نہیں ملا.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "اس ویب سائٹ کے تمام اعدادوشمار کو حذف کر دیا جائے گا، لیکن آپ کا ٹریکنگ کوڈ برقرار رہے گا۔",
@@ -184,12 +204,8 @@
   "message.share-url": "یہ {target} کے لیے عوامی طور پر اشتراک کردہ URL ہے۔",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "ٹریکنگ کوڈ",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "{os} {device} پر {browser} کا استعمال کرتے ہوئے {country} سے آنے والا",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "آپ کے پاس کوئی ویب سائٹ کنفیگر نہیں ہے۔",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "{os} {device} پر {browser} کا استعمال کرتے ہوئے {country} سے آنے والا"
 }
diff --git a/lang/vi-VN.json b/lang/vi-VN.json
index b105cd6b24..e9bce2d3c5 100644
--- a/lang/vi-VN.json
+++ b/lang/vi-VN.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "Thêm website",
   "label.admin": "Quản trị",
+  "label.after": "After",
   "label.all": "Tất cả",
   "label.all-time": "Toàn thời gian",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "Thời gian truy cập trung bình",
   "label.back": "Quay về",
+  "label.before": "Before",
   "label.bounce-rate": "Tỷ lệ thoát trang",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "Trình duyệt",
   "label.cancel": "Huỷ bỏ",
   "label.change-password": "Đổi mật khẩu",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "Xác nhận mật khẩu",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "Quốc gia",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "Phạm vi ngày tuỳ chọn",
   "label.dashboard": "Bảng điều khiển",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "Phạm vi ngày",
+  "label.day": "Day",
   "label.default-date-range": "Khoảng thời gian mặc định",
   "label.delete": "Xoá",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "Xóa website",
+  "label.description": "Description",
   "label.desktop": "Máy bàn",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "Thiết bị",
   "label.dismiss": "Loại trừ",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "Tên miền",
   "label.dropoff": "Dropoff",
   "label.edit": "Chỉnh sửa",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "Sự kiện",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "Kết hợp",
   "label.filter-raw": "Gốc",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "Language",
@@ -61,17 +83,25 @@
   "label.last-hours": "{x} giờ gần nhất",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "Đăng nhập",
   "label.logout": "Đăng xuất",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "Di động",
   "label.more": "Thêm",
+  "label.my-websites": "My websites",
   "label.name": "Tên",
   "label.new-password": "Mật khẩu mới",
   "label.none": "None",
-  "label.operating-systems": "Hệ điều hành",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "Chủ sở hữu",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "Lượt xem",
+  "label.pageTitle": "Page title",
   "label.pages": "Trang",
   "label.password": "Mật khẩu",
   "label.powered-by": "Bản quyền thuộc về {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "Query parameters",
   "label.realtime": "Thời gian thực",
+  "label.referrer": "Referrer",
   "label.referrers": "Liên kết giới thiệu",
   "label.refresh": "Làm mới",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "Yêu cầu",
   "label.reset": "Tái thiết lập",
   "label.reset-website": "Tái thiết lập thống kê",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "Lưu",
@@ -99,12 +132,15 @@
   "label.settings": "Cài đặt",
   "label.share-url": "Chia sẻ URL",
   "label.single-day": "Trong ngày",
+  "label.sum": "Sum",
   "label.tablet": "Máy tính bảng",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "Giao diện",
   "label.this-month": "Tháng này",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "Hôm nay",
   "label.toggle-charts": "Bật/tắt biểu đồ",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "Mã theo dõi",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "Khách truy cập một lần",
   "label.unknown": "Không rõ",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "Tên đăng nhập",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "Xem chi tiết",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "Websites",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "{x} hiện tại {x, plural, one {một} other {trên}}",
   "message.confirm-delete": "Bạn có chắc chắn muốn xoá {target}?",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "Sai tên đăng nhập/mật khẩu.",
   "message.invalid-domain": "Tên miền không hợp lệ",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "Không có dữ liệu.",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "Mật khẩu không đồng nhất",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "Bạn chưa có bất cứ website nào.",
   "message.page-not-found": "Trang không tìm thấy.",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "Tất cả số liệu thống kê của website này sẽ bị xoá, nhưng mã theo dõi sẽ vẫn giữ nguyên.",
@@ -184,12 +204,8 @@
   "message.share-url": "Đây là đường dẫn URL cho {target}.",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "Mã theo dõi",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "Khách từ {country} đang dùng {browser} trên {os} {device}",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "Bạn chưa có bất cứ website nào.",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "Khách từ {country} đang dùng {browser} trên {os} {device}"
 }
diff --git a/lang/zh-CN.json b/lang/zh-CN.json
index f40dd88aae..91043dacc3 100644
--- a/lang/zh-CN.json
+++ b/lang/zh-CN.json
@@ -6,21 +6,30 @@
   "label.add-description": "添加描述",
   "label.add-website": "添加网站",
   "label.admin": "管理员",
+  "label.after": "之后",
   "label.all": "所有",
   "label.all-time": "所有时间段",
   "label.analytics": "分析",
+  "label.average": "平均",
   "label.average-visit-time": "平均访问时间",
   "label.back": "返回",
+  "label.before": "之前",
   "label.bounce-rate": "跳出率",
+  "label.breakdown": "故障",
+  "label.browser": "Browser",
   "label.browsers": "浏览器",
   "label.cancel": "取消",
   "label.change-password": "更新密码",
   "label.cities": "市/县",
+  "label.city": "City",
   "label.clear-all": "清除全部",
   "label.confirm": "确认",
   "label.confirm-password": "确认密码",
+  "label.contains": "包含",
   "label.continue": "继续",
   "label.countries": "国家/地区",
+  "label.country": "Country",
+  "label.create-report": "创建报告",
   "label.create-team": "创建团队",
   "label.create-user": "创建用户",
   "label.created": "已创建",
@@ -28,30 +37,43 @@
   "label.custom-range": "自定义时间段",
   "label.dashboard": "仪表板",
   "label.data": "统计数据",
+  "label.date": "Date",
   "label.date-range": "时间段",
+  "label.day": "Day",
   "label.default-date-range": "默认时间段",
   "label.delete": "删除",
   "label.delete-team": "删除团队",
   "label.delete-user": "删除用户",
   "label.delete-website": "删除网站",
+  "label.description": "描述",
   "label.desktop": "台式机",
   "label.details": "详细信息",
+  "label.device": "Device",
   "label.devices": "设备",
   "label.dismiss": "关闭",
+  "label.does-not-contain": "不包含",
   "label.domain": "域名",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "丢弃",
   "label.edit": "编辑",
   "label.edit-dashboard": "编辑仪表板",
   "label.enable-share-url": "启用共享链接",
-  "label.event": "Event",
-  "label.event-data": "Event data",
+  "label.event": "事件",
+  "label.event-data": "事件数据",
   "label.events": "行为类别",
+  "label.false": "否",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "合并",
   "label.filter-raw": "原始",
-  "label.funnel": "Funnel",
-  "label.insights": "Insights",
+  "label.filters": "筛选",
+  "label.funnel": "分析",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
+  "label.insights": "见解",
+  "label.is": "等于",
+  "label.is-not": "不等于",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "加入",
   "label.join-team": "加入团队",
   "label.language": "语言",
@@ -61,50 +83,64 @@
   "label.last-hours": "最近 {x} 小时",
   "label.leave": "离开",
   "label.leave-team": "离开团队",
+  "label.less-than": "少于",
+  "label.less-than-equals": "少于等于",
   "label.login": "登录",
   "label.logout": "退出",
+  "label.max": "最大",
   "label.members": "成员",
+  "label.min": "最小",
   "label.mobile": "手机",
   "label.more": "更多",
+  "label.my-websites": "My websites",
   "label.name": "名字",
   "label.new-password": "新密码",
   "label.none": "无",
-  "label.operating-systems": "操作系统",
+  "label.os": "OS",
+  "label.overview": "概览",
   "label.owner": "所有者",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "页面浏览量",
+  "label.pageTitle": "Page title",
   "label.pages": "网页",
   "label.password": "密码",
   "label.powered-by": "由 {name} 提供支持",
   "label.profile": "个人资料",
   "label.queries": "查询",
-  "label.query": "Query",
+  "label.query": "查询",
   "label.query-parameters": "查询参数",
   "label.realtime": "实时",
+  "label.referrer": "Referrer",
   "label.referrers": "来源域名",
   "label.refresh": "刷新",
   "label.regenerate": "重新生成",
+  "label.region": "Region",
   "label.regions": "州/省",
   "label.remove": "移除",
-  "label.reports": "Reports",
+  "label.reports": "报告",
   "label.required": "必填",
   "label.reset": "重置",
   "label.reset-website": "重置统计数据",
+  "label.retention": "Retention",
   "label.role": "角色",
-  "label.run-query": "Run query",
+  "label.run-query": "查询",
   "label.save": "保存",
   "label.screens": "屏幕尺寸",
-  "label.select-date": "Select date",
+  "label.select-date": "选择数据",
   "label.select-website": "选择网站",
   "label.sessions": "会话",
   "label.settings": "设置",
   "label.share-url": "共享链接",
   "label.single-day": "单日",
+  "label.sum": "总和",
   "label.tablet": "平板",
   "label.team": "团队",
   "label.team-guest": "团队访客",
   "label.team-id": "团队 ID",
   "label.team-member": "团队成员",
+  "label.team-name": "Team name",
   "label.team-owner": "团队所有者",
+  "label.team-websites": "Team websites",
   "label.teams": "团队",
   "label.theme": "主题",
   "label.this-month": "本月",
@@ -114,51 +150,31 @@
   "label.title": "标题",
   "label.today": "今天",
   "label.toggle-charts": "切换图表",
+  "label.total": "总数",
+  "label.total-records": "总记录数",
   "label.tracking-code": "跟踪代码",
+  "label.true": "是",
+  "label.type": "类型",
+  "label.unique": "Unique",
   "label.unique-visitors": "独立访客",
   "label.unknown": "未知",
+  "label.untitled": "未命名",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "用户",
   "label.username": "用户名",
   "label.users": "用户",
+  "label.value": "值",
   "label.view": "查看",
   "label.view-details": "查看更多",
   "label.view-only": "View only",
   "label.views": "浏览量",
   "label.visitors": "访客",
-  "label.website": "Website",
+  "label.website": "网站",
   "label.website-id": "网站 ID",
   "label.websites": "网站",
   "label.window": "窗口",
   "label.yesterday": "昨天",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "创建报告",
-  "labels.description": "描述",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "未命名",
-  "labels.value": "Value",
   "message.active-users": "当前在线 {x} 人",
   "message.confirm-delete": "你确定要删除 {target} 吗？",
   "message.confirm-leave": "你确定要离开 {target} 吗？",
@@ -172,24 +188,24 @@
   "message.incorrect-username-password": "用户名或密码不正确。",
   "message.invalid-domain": "无效域名",
   "message.min-password-length": "密码最短长度为 {n} 个字符",
+  "message.new-version-available": "Umami的新版本{version}已推出！",
   "message.no-data-available": "无可用数据。",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "无可用事件。",
   "message.no-match-password": "密码不一致",
+  "message.no-results-found": "没有找到任何结果。",
+  "message.no-team-websites": "这个团队没有任何网站。",
   "message.no-teams": "你还没有创建任何团队。",
   "message.no-users": "没有任何用户。",
+  "message.no-websites-configured": "你还没有设置任何网站。",
   "message.page-not-found": "网页未找到。",
-  "message.reset-website": "确定重置该网站, 请在下面的输入框中输入 {confirmation} 进行二次确认。",
+  "message.reset-website": "如果确定重置该网站, 请在下面的输入框中输入 {confirmation} 进行二次确认。",
   "message.reset-website-warning": "本网站的所有统计数据将被删除，但您的跟踪代码将保持不变。",
   "message.saved": "保存成功。",
   "message.share-url": "这是 {target} 的共享链接。",
   "message.team-already-member": "你已经是该团队的成员。",
   "message.team-not-found": "未找到团队。",
-  "message.tracking-code": "跟踪代码",
-  "message.user-deleted": "User deleted.",
-  "message.visitor-log": "来自{country}的访客在搭载 {os} 的{device}上使用 {browser} 浏览器进行访问。",
-  "message.no-results-found": "没有找到任何结果。",
-  "message.no-team-websites": "这个团队没有任何网站。",
-  "message.no-websites-configured": "你还没有设置任何网站。",
   "message.team-websites-info": "团队中的任何人都可查看网站。",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.tracking-code": "跟踪代码",
+  "message.user-deleted": "用户已删除。",
+  "message.visitor-log": "来自{country}的访客在搭载 {os} 的{device}上使用 {browser} 浏览器进行访问。"
 }
diff --git a/lang/zh-TW.json b/lang/zh-TW.json
index a95d50df91..c5761150c3 100644
--- a/lang/zh-TW.json
+++ b/lang/zh-TW.json
@@ -6,21 +6,30 @@
   "label.add-description": "Add description",
   "label.add-website": "增加網站",
   "label.admin": "管理員",
+  "label.after": "After",
   "label.all": "所有",
   "label.all-time": "所有時間段",
   "label.analytics": "Analytics",
+  "label.average": "Average",
   "label.average-visit-time": "平均訪問時間",
   "label.back": "返回",
+  "label.before": "Before",
   "label.bounce-rate": "跳出率",
+  "label.breakdown": "Breakdown",
+  "label.browser": "Browser",
   "label.browsers": "瀏覽器",
   "label.cancel": "取消",
   "label.change-password": "更新密碼",
   "label.cities": "Cities",
+  "label.city": "City",
   "label.clear-all": "Clear all",
   "label.confirm": "Confirm",
   "label.confirm-password": "確認密碼",
+  "label.contains": "Contains",
   "label.continue": "Continue",
   "label.countries": "國家/地區",
+  "label.country": "Country",
+  "label.create-report": "Create report",
   "label.create-team": "Create team",
   "label.create-user": "Create user",
   "label.created": "Created",
@@ -28,16 +37,21 @@
   "label.custom-range": "自定義時段",
   "label.dashboard": "管理面板",
   "label.data": "Data",
+  "label.date": "Date",
   "label.date-range": "多日",
+  "label.day": "Day",
   "label.default-date-range": "默認日期範圍",
   "label.delete": "刪除",
   "label.delete-team": "Delete team",
   "label.delete-user": "Delete user",
   "label.delete-website": "刪除網站",
+  "label.description": "Description",
   "label.desktop": "桌機",
   "label.details": "Details",
+  "label.device": "Device",
   "label.devices": "裝置",
   "label.dismiss": "關閉",
+  "label.does-not-contain": "Does not contain",
   "label.domain": "域名",
   "label.dropoff": "Dropoff",
   "label.edit": "編輯",
@@ -46,12 +60,20 @@
   "label.event": "Event",
   "label.event-data": "Event data",
   "label.events": "行為類別",
+  "label.false": "False",
   "label.field": "Field",
   "label.fields": "Fields",
   "label.filter-combined": "總和",
   "label.filter-raw": "原始",
+  "label.filters": "Filters",
   "label.funnel": "Funnel",
+  "label.greater-than": "Greater than",
+  "label.greater-than-equals": "Greater than or equals",
   "label.insights": "Insights",
+  "label.is": "Is",
+  "label.is-not": "Is not",
+  "label.is-not-set": "Is not set",
+  "label.is-set": "Is set",
   "label.join": "Join",
   "label.join-team": "Join team",
   "label.language": "語言",
@@ -61,17 +83,25 @@
   "label.last-hours": "最近 {x} 小時",
   "label.leave": "Leave",
   "label.leave-team": "Leave team",
+  "label.less-than": "Less than",
+  "label.less-than-equals": "Less than or equals",
   "label.login": "登入",
   "label.logout": "退出",
+  "label.max": "Max",
   "label.members": "Members",
+  "label.min": "Min",
   "label.mobile": "手機",
   "label.more": "更多",
+  "label.my-websites": "My websites",
   "label.name": "名字",
   "label.new-password": "新密碼",
   "label.none": "無",
-  "label.operating-systems": "操作系統",
+  "label.os": "OS",
+  "label.overview": "Overview",
   "label.owner": "擁有者",
+  "label.page-of": "Page {current} of {total}",
   "label.page-views": "網頁流量",
+  "label.pageTitle": "Page title",
   "label.pages": "網頁",
   "label.password": "密碼",
   "label.powered-by": "運行 {name}",
@@ -80,15 +110,18 @@
   "label.query": "Query",
   "label.query-parameters": "查詢參數",
   "label.realtime": "實時",
+  "label.referrer": "Referrer",
   "label.referrers": "指入域名",
   "label.refresh": "刷新",
   "label.regenerate": "Regenerate",
+  "label.region": "Region",
   "label.regions": "Regions",
   "label.remove": "Remove",
   "label.reports": "Reports",
   "label.required": "必填",
   "label.reset": "重置",
   "label.reset-website": "重置統計數據",
+  "label.retention": "Retention",
   "label.role": "Role",
   "label.run-query": "Run query",
   "label.save": "保存",
@@ -99,12 +132,15 @@
   "label.settings": "設置",
   "label.share-url": "分享連結",
   "label.single-day": "單日",
+  "label.sum": "Sum",
   "label.tablet": "平板",
   "label.team": "Team",
   "label.team-guest": "Team guest",
   "label.team-id": "Team ID",
   "label.team-member": "Team member",
+  "label.team-name": "Team name",
   "label.team-owner": "Team owner",
+  "label.team-websites": "Team websites",
   "label.teams": "Teams",
   "label.theme": "主題",
   "label.this-month": "本月",
@@ -114,14 +150,21 @@
   "label.title": "Title",
   "label.today": "今天",
   "label.toggle-charts": "切換圖表",
+  "label.total": "Total",
+  "label.total-records": "Total records",
   "label.tracking-code": "追蹤代碼",
+  "label.true": "True",
+  "label.type": "Type",
+  "label.unique": "Unique",
   "label.unique-visitors": "獨立訪客",
   "label.unknown": "未知",
+  "label.untitled": "Untitled",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "User",
   "label.username": "用户名",
   "label.users": "Users",
+  "label.value": "Value",
   "label.view": "View",
   "label.view-details": "查看更多",
   "label.view-only": "View only",
@@ -132,33 +175,6 @@
   "label.websites": "網站",
   "label.window": "Window",
   "label.yesterday": "Yesterday",
-  "labels.after": "After",
-  "labels.average": "Average",
-  "labels.before": "Before",
-  "labels.breakdown": "Breakdown",
-  "labels.contains": "Contains",
-  "labels.create-report": "Create report",
-  "labels.description": "Description",
-  "labels.does-not-contain": "Does not contain",
-  "labels.does-not-equal": "Does not equal",
-  "labels.equals": "Equals",
-  "labels.false": "False",
-  "labels.filters": "Filters",
-  "labels.greater-than": "Greater than",
-  "labels.greater-than-equals": "Greater than or equals",
-  "labels.less-than": "Less than",
-  "labels.less-than-equals": "Less than or equals",
-  "labels.max": "Max",
-  "labels.min": "Min",
-  "labels.overview": "Overview",
-  "labels.sum": "Sum",
-  "labels.total": "Total",
-  "labels.total-records": "Total records",
-  "labels.true": "True",
-  "labels.type": "Type",
-  "labels.unique": "Unique",
-  "labels.untitled": "Untitled",
-  "labels.value": "Value",
   "message.active-users": "當前線上 {x} 人",
   "message.confirm-delete": "你確定要刪除 {target} 嗎？",
   "message.confirm-leave": "Are you sure you want to leave {target}?",
@@ -172,11 +188,15 @@
   "message.incorrect-username-password": "用户名或密碼不正確。",
   "message.invalid-domain": "無效域名",
   "message.min-password-length": "Minimum length of {n} characters",
+  "message.new-version-available": "A new version of Umami {version} is available!",
   "message.no-data-available": "無可用數據。",
   "message.no-event-data": "No event data is available.",
   "message.no-match-password": "密碼不一致",
+  "message.no-results-found": "No results were found.",
+  "message.no-team-websites": "This team does not have any websites.",
   "message.no-teams": "You have not created any teams.",
   "message.no-users": "There are no users.",
+  "message.no-websites-configured": "目前無任何網站設定。",
   "message.page-not-found": "網頁未找到。",
   "message.reset-website": "To reset this website, type {confirmation} in the box below to confirm.",
   "message.reset-website-warning": "本網站的所有統計數據將被刪除，但您的跟蹤代碼將保持不變。",
@@ -184,12 +204,8 @@
   "message.share-url": "這是 {target} 的分享連結。",
   "message.team-already-member": "You are already a member of the team.",
   "message.team-not-found": "Team not found.",
+  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
   "message.tracking-code": "追蹤代碼",
   "message.user-deleted": "User deleted.",
-  "message.visitor-log": "來自{country}的訪客在搭載 {os} 的{device}上使用 {browser} 進行訪問。",
-  "message.no-results-found": "No results were found.",
-  "message.no-team-websites": "This team does not have any websites.",
-  "message.no-websites-configured": "目前無任何網站設定。",
-  "message.team-websites-info": "Websites can be viewed by anyone on the team.",
-  "message.new-version-available": "A new version of Umami {version} is available!"
+  "message.visitor-log": "來自{country}的訪客在搭載 {os} 的{device}上使用 {browser} 進行訪問。"
 }
diff --git a/lib/charts.js b/lib/charts.js
index 0571a9a9ec..ff746cb50b 100644
--- a/lib/charts.js
+++ b/lib/charts.js
@@ -1,5 +1,5 @@
 import { StatusLight } from 'react-basics';
-import { dateFormat } from 'lib/date';
+import { formatDate } from 'lib/date';
 import { formatLongNumber } from 'lib/format';
 
 export function renderNumberLabels(label) {
@@ -12,15 +12,15 @@ export function renderDateLabels(unit, locale) {
 
     switch (unit) {
       case 'minute':
-        return dateFormat(d, 'h:mm', locale);
+        return formatDate(d, 'h:mm', locale);
       case 'hour':
-        return dateFormat(d, 'p', locale);
+        return formatDate(d, 'p', locale);
       case 'day':
-        return dateFormat(d, 'MMM d', locale);
+        return formatDate(d, 'MMM d', locale);
       case 'month':
-        return dateFormat(d, 'MMM', locale);
+        return formatDate(d, 'MMM', locale);
       case 'year':
-        return dateFormat(d, 'YYY', locale);
+        return formatDate(d, 'YYY', locale);
       default:
         return label;
     }
@@ -50,7 +50,7 @@ export function renderStatusTooltipPopup(unit, locale) {
 
     setTooltipPopup(
       <>
-        <div>{dateFormat(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
+        <div>{formatDate(new Date(dataPoints[0].raw.x), formats[unit], locale)}</div>
         <div>
           <StatusLight color={labelColors?.[0]?.backgroundColor}>
             {formatLongNumber(dataPoints[0].raw.y)} {dataPoints[0].dataset.label}
diff --git a/lib/clickhouse.ts b/lib/clickhouse.ts
index b3dc2c48b4..bc10a6d4e7 100644
--- a/lib/clickhouse.ts
+++ b/lib/clickhouse.ts
@@ -2,8 +2,10 @@ import { ClickHouse } from 'clickhouse';
 import dateFormat from 'dateformat';
 import debug from 'debug';
 import { CLICKHOUSE } from 'lib/db';
-import { WebsiteMetricFilter } from './types';
-import { FILTER_COLUMNS } from './constants';
+import { QueryFilters, QueryOptions } from './types';
+import { FILTER_COLUMNS, OPERATORS } from './constants';
+import { loadWebsite } from './load';
+import { maxDate } from './date';
 
 export const CLICKHOUSE_DATE_FORMATS = {
   minute: '%Y-%m-%d %H:%M:00',
@@ -61,14 +63,29 @@ function getDateFormat(date) {
   return `'${dateFormat(date, 'UTC:yyyy-mm-dd HH:MM:ss')}'`;
 }
 
-function getFilterQuery(filters = {}, params = {}) {
-  const query = Object.keys(filters).reduce((arr, key) => {
-    const filter = filters[key];
+function mapFilter(column, operator, name, type = 'String') {
+  switch (operator) {
+    case OPERATORS.equals:
+      return `${column} = {${name}:${type}}`;
+    case OPERATORS.notEquals:
+      return `${column} != {${name}:${type}}`;
+    default:
+      return '';
+  }
+}
+
+function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}) {
+  const query = Object.keys(filters).reduce((arr, name) => {
+    const value = filters[name];
+    const operator = value?.filter ?? OPERATORS.equals;
+    const column = FILTER_COLUMNS[name] ?? options?.columns?.[name];
 
-    if (filter !== undefined) {
-      const column = FILTER_COLUMNS[key] || key;
-      arr.push(`and ${column} = {${key}:String}`);
-      params[key] = decodeURIComponent(filter);
+    if (value !== undefined && column) {
+      arr.push(`and ${mapFilter(column, operator, name)}`);
+
+      if (name === 'referrer') {
+        arr.push('and referrer_domain != {websiteDomain:String}');
+      }
     }
 
     return arr;
@@ -77,9 +94,27 @@ function getFilterQuery(filters = {}, params = {}) {
   return query.join('\n');
 }
 
-function parseFilters(filters: WebsiteMetricFilter = {}, params: any = {}) {
+function normalizeFilters(filters = {}) {
+  return Object.keys(filters).reduce((obj, key) => {
+    const value = filters[key];
+
+    obj[key] = value?.value ?? value;
+
+    return obj;
+  }, {});
+}
+
+async function parseFilters(websiteId: string, filters: QueryFilters = {}, options?: QueryOptions) {
+  const website = await loadWebsite(websiteId);
+
   return {
-    filterQuery: getFilterQuery(filters, params),
+    filterQuery: getFilterQuery(filters, options),
+    params: {
+      ...normalizeFilters(filters),
+      websiteId,
+      startDate: maxDate(filters.startDate, website.resetAt),
+      websiteDomain: website.domain,
+    },
   };
 }
 
diff --git a/lib/constants.ts b/lib/constants.ts
index c275ed8d43..888c14843a 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -30,6 +30,22 @@ export const FILTER_RANGE = 'filter-range';
 export const FILTER_REFERRERS = 'filter-referrers';
 export const FILTER_PAGES = 'filter-pages';
 
+export const USER_FILTER_TYPES = {
+  all: 'All',
+  username: 'Username',
+} as const;
+export const WEBSITE_FILTER_TYPES = { all: 'All', name: 'Name', domain: 'Domain' } as const;
+export const TEAM_FILTER_TYPES = { all: 'All', name: 'Name', 'user:username': 'Owner' } as const;
+export const REPORT_FILTER_TYPES = {
+  all: 'All',
+  name: 'Name',
+  description: 'Description',
+  type: 'Type',
+  'user:username': 'Username',
+  'website:name': 'Website Name',
+  'website:domain': 'Website Domain',
+} as const;
+
 export const EVENT_COLUMNS = ['url', 'referrer', 'title', 'query', 'event'];
 
 export const SESSION_COLUMNS = [
@@ -43,18 +59,24 @@ export const SESSION_COLUMNS = [
   'city',
 ];
 
-export const COLLECTION_TYPE = {
-  event: 'event',
-  identify: 'identify',
-};
-
 export const FILTER_COLUMNS = {
   url: 'url_path',
   referrer: 'referrer_domain',
   title: 'page_title',
   query: 'url_query',
-  event: 'event_name',
+  os: 'os',
+  browser: 'browser',
+  device: 'device',
+  country: 'country',
   region: 'subdivision1',
+  city: 'city',
+  language: 'language',
+  event: 'event_name',
+};
+
+export const COLLECTION_TYPE = {
+  event: 'event',
+  identify: 'identify',
 };
 
 export const EVENT_TYPE = {
@@ -70,6 +92,23 @@ export const DATA_TYPE = {
   array: 5,
 } as const;
 
+export const OPERATORS = {
+  equals: 'eq',
+  notEquals: 'neq',
+  set: 's',
+  notSet: 'ns',
+  contains: 'c',
+  doesNotContain: 'dnc',
+  true: 't',
+  false: 'f',
+  greaterThan: 'gt',
+  lessThan: 'lt',
+  greaterThanEquals: 'gte',
+  lessThanEquals: 'lte',
+  before: 'bf',
+  after: 'af',
+} as const;
+
 export const DATA_TYPES = {
   [DATA_TYPE.string]: 'string',
   [DATA_TYPE.number]: 'number',
@@ -78,6 +117,12 @@ export const DATA_TYPES = {
   [DATA_TYPE.array]: 'array',
 };
 
+export const REPORT_TYPES = {
+  funnel: 'funnel',
+  insights: 'insights',
+  retention: 'retention',
+} as const;
+
 export const REPORT_PARAMETERS = {
   fields: 'fields',
   filters: 'filters',
@@ -120,37 +165,6 @@ export const ROLE_PERMISSIONS = {
   [ROLES.teamMember]: [],
 } as const;
 
-export const WEBSITE_EVENT_FIELDS = {
-  eventId: { name: 'event_id', type: 'uuid', label: 'Event ID' },
-  websiteId: { name: 'website_id', type: 'uuid', label: 'Website ID' },
-  sessionId: { name: 'session_id', type: 'uuid', label: 'Session ID' },
-  createdAt: { name: 'created_at', type: 'date', label: 'Created date' },
-  urlPath: { name: 'url_path', type: 'string', label: 'URL path' },
-  urlQuery: { name: 'url_query', type: 'string', label: 'URL query' },
-  referrerPath: { name: 'referrer_path', type: 'string', label: 'Referrer path' },
-  referrerQuery: { name: 'referrer_query', type: 'string', label: 'Referrer query' },
-  referrerDomain: { name: 'referrer_domain', type: 'string', label: 'Referrer domain' },
-  pageTitle: { name: 'page_title', type: 'string', label: 'Page title' },
-  eventType: { name: 'event_type', type: 'string', label: 'Event type' },
-  eventName: { name: 'event_name', type: 'string', label: 'Event name' },
-};
-
-export const SESSION_FIELDS = {
-  sessionId: { name: 'session_id', type: 'uuid' },
-  websiteId: { name: 'website_id', type: 'uuid' },
-  hostname: { name: 'hostname', type: 'string' },
-  browser: { name: 'browser', type: 'string' },
-  os: { name: 'os', type: 'string' },
-  device: { name: 'device', type: 'string' },
-  screen: { name: 'screen', type: 'string' },
-  language: { name: 'language', type: 'string' },
-  country: { name: 'country', type: 'string' },
-  subdivision1: { name: 'subdivision1', type: 'string' },
-  subdivision2: { name: 'subdivision2', type: 'string' },
-  city: { name: 'city', type: 'string' },
-  createdAt: { name: 'created_at', type: 'date' },
-};
-
 export const THEME_COLORS = {
   light: {
     primary: '#2680eb',
@@ -199,8 +213,11 @@ export const EVENT_COLORS = [
 
 export const DOMAIN_REGEX =
   /^(localhost(:[1-9]\d{0,4})?|((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9-]+(-[a-z0-9-]+)*\.)+(xn--)?[a-z0-9-]{2,63})$/;
-
 export const SHARE_ID_REGEX = /^[a-zA-Z0-9]{16}$/;
+export const UUID_REGEX =
+  /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/;
+export const HOSTNAME_REGEX =
+  /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/;
 
 export const DESKTOP_SCREEN_WIDTH = 1920;
 export const LAPTOP_SCREEN_WIDTH = 1024;
diff --git a/lib/data.ts b/lib/data.ts
index c2c53de317..47023bb43e 100644
--- a/lib/data.ts
+++ b/lib/data.ts
@@ -25,7 +25,7 @@ export function flattenJSON(
   ).keyValues;
 }
 
-export function getDynamicDataType(value: any): string {
+export function getDataType(value: any): string {
   let type: string = typeof value;
 
   if ((type === 'string' && isValid(value)) || isValid(parseISO(value))) {
@@ -36,7 +36,7 @@ export function getDynamicDataType(value: any): string {
 }
 
 function createKey(key, value, acc: { keyValues: any[]; parentKey: string }) {
-  const type = getDynamicDataType(value);
+  const type = getDataType(value);
 
   let dynamicDataType = null;
 
diff --git a/lib/date.js b/lib/date.js
index bf5dd90a34..49bff89708 100644
--- a/lib/date.js
+++ b/lib/date.js
@@ -249,10 +249,14 @@ export const customFormats = {
   },
 };
 
-export function dateFormat(date, str, locale = 'en-US') {
-  return format(date, customFormats?.[locale]?.[str] || str, {
-    locale: getDateLocale(locale),
-  });
+export function formatDate(date, str, locale = 'en-US') {
+  return format(
+    typeof date === 'string' ? new Date(date) : date,
+    customFormats?.[locale]?.[str] || str,
+    {
+      locale: getDateLocale(locale),
+    },
+  );
 }
 
 export function maxDate(...args) {
diff --git a/lib/detect.ts b/lib/detect.ts
index 9c1e1fa49d..43dac64993 100644
--- a/lib/detect.ts
+++ b/lib/detect.ts
@@ -3,6 +3,7 @@ import { getClientIp } from 'request-ip';
 import { browserName, detectOS } from 'detect-browser';
 import isLocalhost from 'is-localhost-ip';
 import maxmind from 'maxmind';
+import { safeDecodeURIComponent } from 'next-basics';
 
 import {
   DESKTOP_OS,
@@ -65,20 +66,18 @@ export async function getLocation(ip, req) {
   // Cloudflare headers
   if (req.headers['cf-ipcountry']) {
     return {
-      country: req.headers['cf-ipcountry'],
+      country: safeDecodeURIComponent(req.headers['cf-ipcountry']),
+      subdivision1: safeDecodeURIComponent(req.headers['cf-region-code']),
+      city: safeDecodeURIComponent(req.headers['cf-ipcity']),
     };
   }
 
   // Vercel headers
   if (req.headers['x-vercel-ip-country']) {
-    const country = req.headers['x-vercel-ip-country'];
-    const region = req.headers['x-vercel-ip-country-region'];
-    const city = req.headers['x-vercel-ip-city'];
-
     return {
-      country,
-      subdivision1: region,
-      city: city ? decodeURIComponent(city) : undefined,
+      country: safeDecodeURIComponent(req.headers['x-vercel-ip-country']),
+      subdivision1: safeDecodeURIComponent(req.headers['x-vercel-ip-country-region']),
+      city: safeDecodeURIComponent(req.headers['x-vercel-ip-city']),
     };
   }
 
diff --git a/lib/lang.js b/lib/lang.js
index 0b03c4495d..caf182644e 100644
--- a/lib/lang.js
+++ b/lib/lang.js
@@ -74,6 +74,7 @@ export const languages = {
   'lt-LT': { label: 'Lietuvių', dateLocale: lt },
   'mn-MN': { label: 'Монгол', dateLocale: mn },
   'ms-MY': { label: 'Malay', dateLocale: ms },
+  'my-MM': { label: 'မြန်မာဘာသာ', dateLocale: enUS },
   'nl-NL': { label: 'Nederlands', dateLocale: nl },
   'nb-NO': { label: 'Norsk Bokmål', dateLocale: nb },
   'pl-PL': { label: 'Polski', dateLocale: pl },
diff --git a/lib/prisma.ts b/lib/prisma.ts
index 08309e311d..12bafa5136 100644
--- a/lib/prisma.ts
+++ b/lib/prisma.ts
@@ -1,7 +1,11 @@
 import prisma from '@umami/prisma-client';
 import moment from 'moment-timezone';
 import { MYSQL, POSTGRESQL, getDatabaseType } from 'lib/db';
-import { FILTER_COLUMNS } from './constants';
+import { FILTER_COLUMNS, SESSION_COLUMNS, OPERATORS } from './constants';
+import { loadWebsite } from './load';
+import { maxDate } from './date';
+import { QueryFilters, QueryOptions, SearchFilter } from './types';
+import { Prisma } from '@prisma/client';
 
 const MYSQL_DATE_FORMATS = {
   minute: '%Y-%m-%d %H:%i:00',
@@ -31,6 +35,30 @@ function getAddMinutesQuery(field: string, minutes: number): string {
   }
 }
 
+function getDayDiffQuery(field1: string, field2: string): string {
+  const db = getDatabaseType(process.env.DATABASE_URL);
+
+  if (db === POSTGRESQL) {
+    return `${field1}::date - ${field2}::date`;
+  }
+
+  if (db === MYSQL) {
+    return `DATEDIFF(${field1}, ${field2})`;
+  }
+}
+
+function getCastColumnQuery(field: string, type: string): string {
+  const db = getDatabaseType(process.env.DATABASE_URL);
+
+  if (db === POSTGRESQL) {
+    return `${field}::${type}`;
+  }
+
+  if (db === MYSQL) {
+    return `${field}`;
+  }
+}
+
 function getDateQuery(field: string, unit: string, timezone?: string): string {
   const db = getDatabaseType();
 
@@ -64,14 +92,31 @@ function getTimestampIntervalQuery(field: string): string {
   }
 }
 
-function getFilterQuery(filters = {}, params = []): string {
-  const query = Object.keys(filters).reduce((arr, key) => {
-    const filter = filters[key];
+function mapFilter(column, operator, name, type = 'varchar') {
+  switch (operator) {
+    case OPERATORS.equals:
+      return `${column} = {{${name}::${type}}}`;
+    case OPERATORS.notEquals:
+      return `${column} != {{${name}::${type}}}`;
+    default:
+      return '';
+  }
+}
+
+function getFilterQuery(filters: QueryFilters = {}, options: QueryOptions = {}): string {
+  const query = Object.keys(filters).reduce((arr, name) => {
+    const value = filters[name];
+    const operator = value?.filter ?? OPERATORS.equals;
+    const column = FILTER_COLUMNS[name] ?? options?.columns?.[name];
 
-    if (filter !== undefined) {
-      const column = FILTER_COLUMNS[key] || key;
-      arr.push(`and ${column}={{${key}}}`);
-      params.push(decodeURIComponent(filter));
+    if (value !== undefined && column) {
+      arr.push(`and ${mapFilter(column, operator, name)}`);
+
+      if (name === 'referrer') {
+        arr.push(
+          'and (website_event.referrer_domain != {{websiteDomain}} or website_event.referrer_domain is null)',
+        );
+      }
     }
 
     return arr;
@@ -80,19 +125,31 @@ function getFilterQuery(filters = {}, params = []): string {
   return query.join('\n');
 }
 
-function parseFilters(
-  filters: { [key: string]: any } = {},
-  params = [],
-  sessionKey = 'session_id',
-) {
-  const { os, browser, device, country, region, city } = filters;
+function normalizeFilters(filters = {}) {
+  return Object.keys(filters).reduce((obj, key) => {
+    const value = filters[key];
+
+    obj[key] = value?.value ?? value;
+
+    return obj;
+  }, {});
+}
+
+async function parseFilters(websiteId, filters: QueryFilters = {}, options: QueryOptions = {}) {
+  const website = await loadWebsite(websiteId);
 
   return {
     joinSession:
-      os || browser || device || country || region || city
-        ? `inner join session on website_event.${sessionKey} = session.${sessionKey}`
+      options?.joinSession || Object.keys(filters).find(key => SESSION_COLUMNS.includes(key))
+        ? `inner join session on website_event.session_id = session.session_id`
         : '',
-    filterQuery: getFilterQuery(filters, params),
+    filterQuery: getFilterQuery(filters, options),
+    params: {
+      ...normalizeFilters(filters),
+      websiteId,
+      startDate: maxDate(filters.startDate, website.resetAt),
+      websiteDomain: website.domain,
+    },
   };
 }
 
@@ -104,7 +161,7 @@ async function rawQuery(sql: string, data: object): Promise<any> {
     return Promise.reject(new Error('Unknown database.'));
   }
 
-  const query = sql?.replaceAll(/\{\{\s*(\w+)(::\w+)?\s*}}/g, (...args) => {
+  const query = sql?.replaceAll(/\{\{\s*(\w+)(::\w+)?\s*\}\}/g, (...args) => {
     const [, name, type] = args;
     params.push(data[name]);
 
@@ -114,12 +171,59 @@ async function rawQuery(sql: string, data: object): Promise<any> {
   return prisma.rawQuery(query, params);
 }
 
+function getPageFilters(filters: SearchFilter<any>): [
+  {
+    orderBy: {
+      [x: string]: string;
+    }[];
+    take: number;
+    skip: number;
+  },
+  {
+    pageSize: number;
+    page: number;
+    orderBy: string;
+  },
+] {
+  const { pageSize = 10, page = 1, orderBy } = filters;
+
+  return [
+    {
+      ...(pageSize > 0 && { take: pageSize, skip: pageSize * (page - 1) }),
+      ...(orderBy && {
+        orderBy: [
+          {
+            [orderBy]: 'asc',
+          },
+        ],
+      }),
+    },
+    { pageSize, page: +page, orderBy },
+  ];
+}
+
+function getSearchMode(): { mode?: Prisma.QueryMode } {
+  const db = getDatabaseType();
+
+  if (db === POSTGRESQL) {
+    return {
+      mode: 'insensitive',
+    };
+  }
+
+  return {};
+}
+
 export default {
   ...prisma,
   getAddMinutesQuery,
+  getDayDiffQuery,
+  getCastColumnQuery,
   getDateQuery,
   getTimestampIntervalQuery,
   getFilterQuery,
   parseFilters,
+  getPageFilters,
+  getSearchMode,
   rawQuery,
 };
diff --git a/lib/types.ts b/lib/types.ts
index 7c91ec4f79..3f3ac53374 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -1,17 +1,64 @@
 import { NextApiRequest } from 'next';
-import { COLLECTION_TYPE, DATA_TYPE, EVENT_TYPE, KAFKA_TOPIC, ROLES } from './constants';
+import {
+  COLLECTION_TYPE,
+  DATA_TYPE,
+  EVENT_TYPE,
+  KAFKA_TOPIC,
+  REPORT_FILTER_TYPES,
+  ROLES,
+  TEAM_FILTER_TYPES,
+  USER_FILTER_TYPES,
+  WEBSITE_FILTER_TYPES,
+} from './constants';
 
 type ObjectValues<T> = T[keyof T];
 
 export type CollectionType = ObjectValues<typeof COLLECTION_TYPE>;
-
 export type Role = ObjectValues<typeof ROLES>;
-
 export type EventType = ObjectValues<typeof EVENT_TYPE>;
-
 export type DynamicDataType = ObjectValues<typeof DATA_TYPE>;
-
 export type KafkaTopic = ObjectValues<typeof KAFKA_TOPIC>;
+export type ReportSearchFilterType = ObjectValues<typeof REPORT_FILTER_TYPES>;
+export type UserSearchFilterType = ObjectValues<typeof USER_FILTER_TYPES>;
+export type WebsiteSearchFilterType = ObjectValues<typeof WEBSITE_FILTER_TYPES>;
+export type TeamSearchFilterType = ObjectValues<typeof TEAM_FILTER_TYPES>;
+
+export interface WebsiteSearchFilter extends SearchFilter<WebsiteSearchFilterType> {
+  userId?: string;
+  teamId?: string;
+  includeTeams?: boolean;
+  onlyTeams?: boolean;
+}
+
+export interface UserSearchFilter extends SearchFilter<UserSearchFilterType> {
+  teamId?: string;
+}
+
+export interface TeamSearchFilter extends SearchFilter<TeamSearchFilterType> {
+  userId?: string;
+}
+
+export interface ReportSearchFilter extends SearchFilter<ReportSearchFilterType> {
+  userId?: string;
+  websiteId?: string;
+  includeTeams?: boolean;
+}
+
+export interface SearchFilter<T> {
+  filter?: string;
+  filterType?: T;
+  pageSize?: number;
+  page?: number;
+  orderBy?: string;
+}
+
+export interface FilterResult<T> {
+  data: T;
+  count: number;
+  pageSize: number;
+  page: number;
+  orderBy?: string;
+}
 
 export interface DynamicData {
   [key: string]: number | string | DynamicData | number[] | string[] | DynamicData[];
@@ -73,37 +120,17 @@ export interface WebsiteMetric {
   y: number;
 }
 
-export interface WebsiteMetricFilter {
-  domain?: string;
-  url?: string;
-  referrer?: string;
-  title?: string;
-  query?: string;
-  event?: string;
-  os?: string;
-  browser?: string;
-  device?: string;
-  country?: string;
-  region?: string;
-  city?: string;
-}
-
 export interface WebsiteEventMetric {
   x: string;
   t: string;
   y: number;
 }
 
-export interface WebsiteEventDataStats {
-  field: string;
-  type: number;
-  total: number;
-}
-
-export interface WebsiteEventDataFields {
-  field: string;
-  type: number;
-  value?: string;
+export interface WebsiteEventData {
+  eventName?: string;
+  fieldName: string;
+  dataType: number;
+  fieldValue?: string;
   total: number;
 }
 
@@ -144,3 +171,28 @@ export interface DateRange {
   unit: string;
   value: string;
 }
+
+export interface QueryFilters {
+  startDate?: Date;
+  endDate?: Date;
+  timezone?: string;
+  unit?: string;
+  eventType?: number;
+  url?: string;
+  referrer?: string;
+  title?: string;
+  query?: string;
+  os?: string;
+  browser?: string;
+  device?: string;
+  country?: string;
+  region?: string;
+  city?: string;
+  language?: string;
+  event?: string;
+}
+
+export interface QueryOptions {
+  joinSession?: boolean;
+  columns?: { [key: string]: string };
+}
diff --git a/package.json b/package.json
index 868b3cdfb3..e1361d208a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",
@@ -90,11 +90,11 @@
     "maxmind": "^4.3.6",
     "moment-timezone": "^0.5.35",
     "next": "13.3.1",
-    "next-basics": "^0.35.0",
+    "next-basics": "^0.36.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
     "react": "^18.2.0",
-    "react-basics": "^0.91.0",
+    "react-basics": "^0.98.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.4",
diff --git a/pages/api/auth/login.ts b/pages/api/auth/login.ts
index af20693871..b9a2be0001 100644
--- a/pages/api/auth/login.ts
+++ b/pages/api/auth/login.ts
@@ -7,6 +7,7 @@ import {
   checkPassword,
   createSecureToken,
   methodNotAllowed,
+  forbidden,
 } from 'next-basics';
 import redis from '@umami/redis-client';
 import { getUserByUsername } from 'queries';
@@ -30,6 +31,10 @@ export default async (
   req: NextApiRequestQueryBody<any, LoginRequestBody>,
   res: NextApiResponse<LoginResponse>,
 ) => {
+  if (process.env.DISABLE_LOGIN) {
+    return forbidden(res);
+  }
+
   if (req.method === 'POST') {
     const { username, password } = req.body;
 
diff --git a/pages/api/event-data/events.ts b/pages/api/event-data/events.ts
index 1d74c3d244..9f8f964b3e 100644
--- a/pages/api/event-data/events.ts
+++ b/pages/api/event-data/events.ts
@@ -5,30 +5,35 @@ import { NextApiResponse } from 'next';
 import { ok, methodNotAllowed, unauthorized } from 'next-basics';
 import { getEventDataEvents } from 'queries';
 
-export interface EventDataFieldsRequestBody {
+export interface EventDataEventsRequestQuery {
   websiteId: string;
   dateRange: {
     startDate: string;
     endDate: string;
   };
+  event?: string;
 }
 
 export default async (
-  req: NextApiRequestQueryBody<any, EventDataFieldsRequestBody>,
+  req: NextApiRequestQueryBody<EventDataEventsRequestQuery>,
   res: NextApiResponse<any>,
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
 
   if (req.method === 'GET') {
-    const { websiteId, startAt, endAt, field, event } = req.query;
+    const { websiteId, startAt, endAt, event } = req.query;
 
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
 
-    const data = await getEventDataEvents(websiteId, new Date(+startAt), new Date(+endAt), {
-      field,
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getEventDataEvents(websiteId, {
+      startDate,
+      endDate,
       event,
     });
 
diff --git a/pages/api/event-data/fields.ts b/pages/api/event-data/fields.ts
index 18b74bc322..b6a7313367 100644
--- a/pages/api/event-data/fields.ts
+++ b/pages/api/event-data/fields.ts
@@ -5,16 +5,17 @@ import { NextApiResponse } from 'next';
 import { ok, methodNotAllowed, unauthorized } from 'next-basics';
 import { getEventDataFields } from 'queries';
 
-export interface EventDataFieldsRequestBody {
+export interface EventDataFieldsRequestQuery {
   websiteId: string;
   dateRange: {
     startDate: string;
     endDate: string;
   };
+  field?: string;
 }
 
 export default async (
-  req: NextApiRequestQueryBody<any, EventDataFieldsRequestBody>,
+  req: NextApiRequestQueryBody<EventDataFieldsRequestQuery>,
   res: NextApiResponse<any>,
 ) => {
   await useCors(req, res);
@@ -27,7 +28,10 @@ export default async (
       return unauthorized(res);
     }
 
-    const data = await getEventDataFields(websiteId, new Date(+startAt), new Date(+endAt), field);
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
+
+    const data = await getEventDataFields(websiteId, { startDate, endDate, field });
 
     return ok(res, data);
   }
diff --git a/pages/api/event-data/stats.ts b/pages/api/event-data/stats.ts
index 8fdf9438b5..4ba843bef0 100644
--- a/pages/api/event-data/stats.ts
+++ b/pages/api/event-data/stats.ts
@@ -3,19 +3,18 @@ import { useCors, useAuth } from 'lib/middleware';
 import { NextApiRequestQueryBody } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { ok, methodNotAllowed, unauthorized } from 'next-basics';
-import { getEventDataFields } from 'queries';
+import { getEventDataStats } from 'queries';
 
-export interface EventDataRequestBody {
+export interface EventDataStatsRequestQuery {
   websiteId: string;
   dateRange: {
     startDate: string;
     endDate: string;
   };
-  field?: string;
 }
 
 export default async (
-  req: NextApiRequestQueryBody<any, EventDataRequestBody>,
+  req: NextApiRequestQueryBody<EventDataStatsRequestQuery>,
   res: NextApiResponse<any>,
 ) => {
   await useCors(req, res);
@@ -28,15 +27,10 @@ export default async (
       return unauthorized(res);
     }
 
-    const results = await getEventDataFields(websiteId, new Date(+startAt), new Date(+endAt));
+    const startDate = new Date(+startAt);
+    const endDate = new Date(+endAt);
 
-    const data = results.reduce(
-      (obj, row) => {
-        obj.records += Number(row.total);
-        return obj;
-      },
-      { fields: results.length, records: 0 },
-    );
+    const data = await getEventDataStats(websiteId, { startDate, endDate });
 
     return ok(res, data);
   }
diff --git a/pages/api/me/teams.ts b/pages/api/me/teams.ts
index 3669901636..d323043b0a 100644
--- a/pages/api/me/teams.ts
+++ b/pages/api/me/teams.ts
@@ -1,10 +1,15 @@
 import { useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiRequestQueryBody, SearchFilter, TeamSearchFilterType } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed } from 'next-basics';
 import userTeams from 'pages/api/users/[id]/teams';
 
-export default async (req: NextApiRequestQueryBody, res: NextApiResponse) => {
+export interface MyTeamsRequestQuery extends SearchFilter<TeamSearchFilterType> {}
+
+export default async (
+  req: NextApiRequestQueryBody<MyTeamsRequestQuery, any>,
+  res: NextApiResponse,
+) => {
   await useCors(req, res);
 
   if (req.method === 'GET') {
diff --git a/pages/api/me/websites.ts b/pages/api/me/websites.ts
index 29f1e4311e..238d1b6e20 100644
--- a/pages/api/me/websites.ts
+++ b/pages/api/me/websites.ts
@@ -1,11 +1,16 @@
 import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiRequestQueryBody, SearchFilter, WebsiteSearchFilterType } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed } from 'next-basics';
 
 import userWebsites from 'pages/api/users/[id]/websites';
 
-export default async (req: NextApiRequestQueryBody, res: NextApiResponse) => {
+export interface MyWebsitesRequestQuery extends SearchFilter<WebsiteSearchFilterType> {}
+
+export default async (
+  req: NextApiRequestQueryBody<MyWebsitesRequestQuery, any>,
+  res: NextApiResponse,
+) => {
   await useCors(req, res);
   await useAuth(req, res);
 
diff --git a/pages/api/reports/index.ts b/pages/api/reports/index.ts
index c856b56597..762f297c77 100644
--- a/pages/api/reports/index.ts
+++ b/pages/api/reports/index.ts
@@ -1,10 +1,12 @@
+import { canViewWebsite } from 'lib/auth';
+import { uuid } from 'lib/crypto';
 import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiRequestQueryBody, ReportSearchFilterType, SearchFilter } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createReport, getWebsiteReports } from 'queries';
-import { canViewWebsite } from 'lib/auth';
-import { uuid } from 'lib/crypto';
+import { createReport, getReportsByUserId, getReportsByWebsiteId } from 'queries';
+
+export interface ReportsRequestQuery extends SearchFilter<ReportSearchFilterType> {}
 
 export interface ReportRequestBody {
   websiteId: string;
@@ -24,18 +26,19 @@ export default async (
   await useCors(req, res);
   await useAuth(req, res);
 
-  const { websiteId } = req.query;
-
   const {
     user: { id: userId },
   } = req.auth;
 
   if (req.method === 'GET') {
-    if (!(websiteId && (await canViewWebsite(req.auth, websiteId)))) {
-      return unauthorized(res);
-    }
-
-    const data = await getWebsiteReports(websiteId);
+    const { page, filter, pageSize } = req.query;
+
+    const data = await getReportsByUserId(userId, {
+      page,
+      filter,
+      pageSize: +pageSize || null,
+      includeTeams: true,
+    });
 
     return ok(res, data);
   }
diff --git a/pages/api/reports/insights.ts b/pages/api/reports/insights.ts
index dba11953ca..09a07d2fb6 100644
--- a/pages/api/reports/insights.ts
+++ b/pages/api/reports/insights.ts
@@ -11,9 +11,17 @@ export interface InsightsRequestBody {
     startDate: string;
     endDate: string;
   };
-  fields: string[];
+  fields: { name: string; type: string; value: string }[];
   filters: string[];
-  groups: string[];
+  groups: { name: string; type: string }[];
+}
+
+function convertFilters(filters) {
+  return filters.reduce((obj, { name, ...value }) => {
+    obj[name] = value;
+
+    return obj;
+  }, {});
 }
 
 export default async (
@@ -29,19 +37,16 @@ export default async (
       dateRange: { startDate, endDate },
       fields,
       filters,
-      groups,
     } = req.body;
 
     if (!(await canViewWebsite(req.auth, websiteId))) {
       return unauthorized(res);
     }
 
-    const data = await getInsights(websiteId, {
+    const data = await getInsights(websiteId, fields, {
+      ...convertFilters(filters),
       startDate: new Date(startDate),
       endDate: new Date(endDate),
-      fields,
-      filters,
-      groups,
     });
 
     return ok(res, data);
diff --git a/pages/api/reports/retention.ts b/pages/api/reports/retention.ts
new file mode 100644
index 0000000000..40b3266bd9
--- /dev/null
+++ b/pages/api/reports/retention.ts
@@ -0,0 +1,47 @@
+import { canViewWebsite } from 'lib/auth';
+import { useCors, useAuth } from 'lib/middleware';
+import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { ok, methodNotAllowed, unauthorized } from 'next-basics';
+import { getRetention } from 'queries';
+
+export interface RetentionRequestBody {
+  websiteId: string;
+  dateRange: { window; startDate: string; endDate: string };
+  timezone: string;
+}
+
+export interface RetentionResponse {
+  startAt: number;
+  endAt: number;
+}
+
+export default async (
+  req: NextApiRequestQueryBody<any, RetentionRequestBody>,
+  res: NextApiResponse<RetentionResponse>,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+
+  if (req.method === 'POST') {
+    const {
+      websiteId,
+      dateRange: { startDate, endDate },
+      timezone,
+    } = req.body;
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const data = await getRetention(websiteId, {
+      startDate: new Date(startDate),
+      endDate: new Date(endDate),
+      timezone,
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/teams/[id]/users/index.ts b/pages/api/teams/[id]/users/index.ts
index c73da68367..6f8b077e05 100644
--- a/pages/api/teams/[id]/users/index.ts
+++ b/pages/api/teams/[id]/users/index.ts
@@ -1,11 +1,11 @@
 import { canUpdateTeam, canViewTeam } from 'lib/auth';
 import { useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiRequestQueryBody, SearchFilter, TeamSearchFilterType } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createTeamUser, getTeamUsers, getUserByUsername } from 'queries';
+import { createTeamUser, getUserByUsername, getUsersByTeamId } from 'queries';
 
-export interface TeamUserRequestQuery {
+export interface TeamUserRequestQuery extends SearchFilter<TeamSearchFilterType> {
   id: string;
 }
 
@@ -27,7 +27,13 @@ export default async (
       return unauthorized(res);
     }
 
-    const users = await getTeamUsers(teamId);
+    const { page, filter, pageSize } = req.query;
+
+    const users = await getUsersByTeamId(teamId, {
+      page,
+      filter,
+      pageSize: +pageSize || null,
+    });
 
     return ok(res, users);
   }
diff --git a/pages/api/teams/[id]/websites/index.ts b/pages/api/teams/[id]/websites/index.ts
index 63be478b17..dcd08939aa 100644
--- a/pages/api/teams/[id]/websites/index.ts
+++ b/pages/api/teams/[id]/websites/index.ts
@@ -1,11 +1,12 @@
 import { canViewTeam } from 'lib/auth';
 import { useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiRequestQueryBody, SearchFilter, WebsiteSearchFilterType } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createTeamWebsites, getTeamWebsites } from 'queries/admin/teamWebsite';
+import { getWebsites, getWebsitesByTeamId } from 'queries';
+import { createTeamWebsites } from 'queries/admin/teamWebsite';
 
-export interface TeamWebsiteRequestQuery {
+export interface TeamWebsiteRequestQuery extends SearchFilter<WebsiteSearchFilterType> {
   id: string;
 }
 
@@ -26,7 +27,13 @@ export default async (
       return unauthorized(res);
     }
 
-    const websites = await getTeamWebsites(teamId);
+    const { page, filter, pageSize } = req.query;
+
+    const websites = await getWebsitesByTeamId(teamId, {
+      page,
+      filter,
+      pageSize: +pageSize || null,
+    });
 
     return ok(res, websites);
   }
diff --git a/pages/api/teams/index.ts b/pages/api/teams/index.ts
index 453f1ef3b5..997ed88549 100644
--- a/pages/api/teams/index.ts
+++ b/pages/api/teams/index.ts
@@ -1,18 +1,19 @@
 import { Team } from '@prisma/client';
-import { NextApiRequestQueryBody } from 'lib/types';
 import { canCreateTeam } from 'lib/auth';
 import { uuid } from 'lib/crypto';
 import { useAuth } from 'lib/middleware';
+import { NextApiRequestQueryBody, SearchFilter, TeamSearchFilterType } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createTeam, getUserTeams } from 'queries';
+import { createTeam, getTeamsByUserId } from 'queries';
 
-export interface TeamsRequestBody {
+export interface TeamsRequestQuery extends SearchFilter<TeamSearchFilterType> {}
+export interface TeamsRequestBody extends SearchFilter<TeamSearchFilterType> {
   name: string;
 }
 
 export default async (
-  req: NextApiRequestQueryBody<any, TeamsRequestBody>,
+  req: NextApiRequestQueryBody<TeamsRequestQuery, TeamsRequestBody>,
   res: NextApiResponse<Team[] | Team>,
 ) => {
   await useAuth(req, res);
@@ -22,9 +23,11 @@ export default async (
   } = req.auth;
 
   if (req.method === 'GET') {
-    const teams = await getUserTeams(userId);
+    const { page, filter, pageSize } = req.query;
 
-    return ok(res, teams);
+    const results = await getTeamsByUserId(userId, { page, filter, pageSize: +pageSize || null });
+
+    return ok(res, results);
   }
 
   if (req.method === 'POST') {
diff --git a/pages/api/users/[id]/teams.ts b/pages/api/users/[id]/teams.ts
index c31b98ca76..831a992d8e 100644
--- a/pages/api/users/[id]/teams.ts
+++ b/pages/api/users/[id]/teams.ts
@@ -1,17 +1,21 @@
 import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiRequestQueryBody, SearchFilter, TeamSearchFilterType } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getUserTeams } from 'queries';
+import { getTeamsByUserId } from 'queries';
 
-export interface UserWebsitesRequestBody {
+export interface UserTeamsRequestQuery extends SearchFilter<TeamSearchFilterType> {
+  id: string;
+}
+
+export interface UserTeamsRequestBody {
   name: string;
   domain: string;
   shareId: string;
 }
 
 export default async (
-  req: NextApiRequestQueryBody<any, UserWebsitesRequestBody>,
+  req: NextApiRequestQueryBody<any, UserTeamsRequestBody>,
   res: NextApiResponse,
 ) => {
   await useCors(req, res);
@@ -25,7 +29,13 @@ export default async (
       return unauthorized(res);
     }
 
-    const teams = await getUserTeams(userId);
+    const { page, filter, pageSize } = req.query;
+
+    const teams = await getTeamsByUserId(userId, {
+      page,
+      filter,
+      pageSize: +pageSize || null,
+    });
 
     return ok(res, teams);
   }
diff --git a/pages/api/users/[id]/websites.ts b/pages/api/users/[id]/websites.ts
index e94094a451..0e9231f739 100644
--- a/pages/api/users/[id]/websites.ts
+++ b/pages/api/users/[id]/websites.ts
@@ -1,9 +1,12 @@
 import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiRequestQueryBody, SearchFilter, WebsiteSearchFilterType } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { getUserWebsites } from 'queries';
+import { getWebsitesByUserId } from 'queries';
 
+export interface UserWebsitesRequestQuery extends SearchFilter<WebsiteSearchFilterType> {
+  id: string;
+}
 export interface UserWebsitesRequestBody {
   name: string;
   domain: string;
@@ -16,17 +19,22 @@ export default async (
 ) => {
   await useCors(req, res);
   await useAuth(req, res);
+
   const { user } = req.auth;
-  const { id: userId } = req.query;
+  const { id: userId, page, filter, pageSize, includeTeams, onlyTeams } = req.query;
 
   if (req.method === 'GET') {
     if (!user.isAdmin && user.id !== userId) {
       return unauthorized(res);
     }
 
-    const { includeTeams } = req.query;
-
-    const websites = await getUserWebsites(userId, { includeTeams });
+    const websites = await getWebsitesByUserId(userId, {
+      page,
+      filter,
+      pageSize: +pageSize || null,
+      includeTeams,
+      onlyTeams,
+    });
 
     return ok(res, websites);
   }
diff --git a/pages/api/users/index.ts b/pages/api/users/index.ts
index 6f6c205f40..5e913c0275 100644
--- a/pages/api/users/index.ts
+++ b/pages/api/users/index.ts
@@ -2,11 +2,12 @@ import { canCreateUser, canViewUsers } from 'lib/auth';
 import { ROLES } from 'lib/constants';
 import { uuid } from 'lib/crypto';
 import { useAuth } from 'lib/middleware';
-import { NextApiRequestQueryBody, Role, User } from 'lib/types';
+import { NextApiRequestQueryBody, Role, SearchFilter, User, UserSearchFilterType } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { badRequest, hashPassword, methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { createUser, getUserByUsername, getUsers } from 'queries';
 
+export interface UsersRequestQuery extends SearchFilter<UserSearchFilterType> {}
 export interface UsersRequestBody {
   username: string;
   password: string;
@@ -15,7 +16,7 @@ export interface UsersRequestBody {
 }
 
 export default async (
-  req: NextApiRequestQueryBody<any, UsersRequestBody>,
+  req: NextApiRequestQueryBody<UsersRequestQuery, UsersRequestBody>,
   res: NextApiResponse<User[] | User>,
 ) => {
   await useAuth(req, res);
@@ -25,7 +26,9 @@ export default async (
       return unauthorized(res);
     }
 
-    const users = await getUsers();
+    const { page, filter, pageSize } = req.query;
+
+    const users = await getUsers({ page, filter, pageSize: +pageSize || null });
 
     return ok(res, users);
   }
diff --git a/pages/api/websites/[id]/events.ts b/pages/api/websites/[id]/events.ts
index b9e3ac71cd..7d4f999f63 100644
--- a/pages/api/websites/[id]/events.ts
+++ b/pages/api/websites/[id]/events.ts
@@ -43,10 +43,8 @@ export default async (
       endDate,
       timezone,
       unit,
-      filters: {
-        url,
-        eventName,
-      },
+      url,
+      eventName,
     });
 
     return ok(res, events);
diff --git a/pages/api/websites/[id]/metrics.ts b/pages/api/websites/[id]/metrics.ts
index 37a0469162..7c84583c2a 100644
--- a/pages/api/websites/[id]/metrics.ts
+++ b/pages/api/websites/[id]/metrics.ts
@@ -23,6 +23,7 @@ export interface WebsiteMetricsRequestQuery {
   country: string;
   region: string;
   city: string;
+  language: string;
 }
 
 export default async (
@@ -46,6 +47,7 @@ export default async (
     country,
     region,
     city,
+    language,
   } = req.query;
 
   if (req.method === 'GET') {
@@ -55,25 +57,29 @@ export default async (
 
     const { startDate, endDate } = await parseDateRangeQuery(req);
 
+    const filters = {
+      startDate,
+      endDate,
+      url,
+      referrer,
+      title,
+      query,
+      event,
+      os,
+      browser,
+      device,
+      country,
+      region,
+      city,
+      language,
+    };
+
+    filters[type] = undefined;
+
+    const column = FILTER_COLUMNS[type] || type;
+
     if (SESSION_COLUMNS.includes(type)) {
-      const column = FILTER_COLUMNS[type] || type;
-      const filters = {
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      };
-
-      filters[type] = undefined;
-
-      let data = await getSessionMetrics(websiteId, {
-        startDate,
-        endDate,
-        column,
-        filters,
-      });
+      const data = await getSessionMetrics(websiteId, column, filters);
 
       if (type === 'language') {
         const combined = {};
@@ -88,36 +94,14 @@ export default async (
           }
         }
 
-        data = Object.values(combined);
+        return ok(res, Object.values(combined));
       }
 
       return ok(res, data);
     }
 
     if (EVENT_COLUMNS.includes(type)) {
-      const column = FILTER_COLUMNS[type] || type;
-      const filters = {
-        url,
-        referrer,
-        title,
-        query,
-        event,
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      };
-
-      filters[type] = undefined;
-
-      const data = await getPageviewMetrics(websiteId, {
-        startDate,
-        endDate,
-        column,
-        filters,
-      });
+      const data = await getPageviewMetrics(websiteId, column, filters);
 
       return ok(res, data);
     }
diff --git a/pages/api/websites/[id]/pageviews.ts b/pages/api/websites/[id]/pageviews.ts
index 453c6733c7..c5532e76e7 100644
--- a/pages/api/websites/[id]/pageviews.ts
+++ b/pages/api/websites/[id]/pageviews.ts
@@ -4,7 +4,7 @@ import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { NextApiRequestQueryBody, WebsitePageviews } from 'lib/types';
 import { canViewWebsite } from 'lib/auth';
 import { useAuth, useCors } from 'lib/middleware';
-import { getPageviewStats } from 'queries';
+import { getPageviewStats, getSessionStats } from 'queries';
 import { parseDateRangeQuery } from 'lib/query';
 
 export interface WebsitePageviewRequestQuery {
@@ -56,42 +56,25 @@ export default async (
       return badRequest(res);
     }
 
+    const filters = {
+      startDate,
+      endDate,
+      timezone,
+      unit,
+      url,
+      referrer,
+      title,
+      os,
+      browser,
+      device,
+      country,
+      region,
+      city,
+    };
+
     const [pageviews, sessions] = await Promise.all([
-      getPageviewStats(websiteId, {
-        startDate,
-        endDate,
-        timezone,
-        unit,
-        count: '*',
-        filters: {
-          url,
-          referrer,
-          title,
-          os,
-          browser,
-          device,
-          country,
-          region,
-          city,
-        },
-      }),
-      getPageviewStats(websiteId, {
-        startDate,
-        endDate,
-        timezone,
-        unit,
-        count: 'distinct website_event.',
-        filters: {
-          url,
-          title,
-          os,
-          browser,
-          device,
-          country,
-          region,
-          city,
-        },
-      }),
+      getPageviewStats(websiteId, filters),
+      getSessionStats(websiteId, filters),
     ]);
 
     return ok(res, { pageviews, sessions });
diff --git a/pages/api/websites/[id]/reports.ts b/pages/api/websites/[id]/reports.ts
new file mode 100644
index 0000000000..60c6f71403
--- /dev/null
+++ b/pages/api/websites/[id]/reports.ts
@@ -0,0 +1,38 @@
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors } from 'lib/middleware';
+import { NextApiRequestQueryBody, ReportSearchFilterType, SearchFilter } from 'lib/types';
+import { NextApiResponse } from 'next';
+import { methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { getReportsByWebsiteId } from 'queries';
+
+export interface ReportsRequestQuery extends SearchFilter<ReportSearchFilterType> {
+  id: string;
+}
+
+export default async (
+  req: NextApiRequestQueryBody<ReportsRequestQuery, any>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+
+  const { id: websiteId } = req.query;
+
+  if (req.method === 'GET') {
+    if (!(websiteId && (await canViewWebsite(req.auth, websiteId)))) {
+      return unauthorized(res);
+    }
+
+    const { page, filter, pageSize } = req.query;
+
+    const data = await getReportsByWebsiteId(websiteId, {
+      page,
+      filter,
+      pageSize: +pageSize || null,
+    });
+
+    return ok(res, data);
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/websites/[id]/stats.ts b/pages/api/websites/[id]/stats.ts
index 3164913d96..a77c7eaf88 100644
--- a/pages/api/websites/[id]/stats.ts
+++ b/pages/api/websites/[id]/stats.ts
@@ -56,40 +56,26 @@ export default async (
     const prevStartDate = subMinutes(startDate, diff);
     const prevEndDate = subMinutes(endDate, diff);
 
-    const metrics = await getWebsiteStats(websiteId, {
-      startDate,
-      endDate,
-      filters: {
-        url,
-        referrer,
-        title,
-        query,
-        event,
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      },
-    });
+    const filters = {
+      url,
+      referrer,
+      title,
+      query,
+      event,
+      os,
+      browser,
+      device,
+      country,
+      region,
+      city,
+    };
+
+    const metrics = await getWebsiteStats(websiteId, { ...filters, startDate, endDate });
 
     const prevPeriod = await getWebsiteStats(websiteId, {
+      ...filters,
       startDate: prevStartDate,
       endDate: prevEndDate,
-      filters: {
-        url,
-        referrer,
-        title,
-        query,
-        event,
-        os,
-        browser,
-        device,
-        country,
-        region,
-        city,
-      },
     });
 
     const stats = Object.keys(metrics[0]).reduce((obj, key) => {
diff --git a/pages/api/websites/[id]/values.ts b/pages/api/websites/[id]/values.ts
new file mode 100644
index 0000000000..ad8625bd4b
--- /dev/null
+++ b/pages/api/websites/[id]/values.ts
@@ -0,0 +1,43 @@
+import { NextApiRequestQueryBody } from 'lib/types';
+import { canViewWebsite } from 'lib/auth';
+import { useAuth, useCors } from 'lib/middleware';
+import { NextApiResponse } from 'next';
+import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';
+import { EVENT_COLUMNS, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
+import { getValues } from 'queries';
+
+export interface WebsiteResetRequestQuery {
+  id: string;
+}
+
+export default async (
+  req: NextApiRequestQueryBody<WebsiteResetRequestQuery>,
+  res: NextApiResponse,
+) => {
+  await useCors(req, res);
+  await useAuth(req, res);
+
+  const { id: websiteId, type } = req.query;
+
+  if (req.method === 'GET') {
+    if (!SESSION_COLUMNS.includes(type as string) && !EVENT_COLUMNS.includes(type as string)) {
+      return badRequest(res);
+    }
+
+    if (!(await canViewWebsite(req.auth, websiteId))) {
+      return unauthorized(res);
+    }
+
+    const values = await getValues(websiteId, FILTER_COLUMNS[type as string]);
+
+    return ok(
+      res,
+      values
+        .map(({ value }) => value)
+        .filter(n => n)
+        .sort(),
+    );
+  }
+
+  return methodNotAllowed(res);
+};
diff --git a/pages/api/websites/index.ts b/pages/api/websites/index.ts
index c8b5aba29c..f94fa03789 100644
--- a/pages/api/websites/index.ts
+++ b/pages/api/websites/index.ts
@@ -1,12 +1,14 @@
 import { canCreateWebsite } from 'lib/auth';
 import { uuid } from 'lib/crypto';
 import { useAuth, useCors } from 'lib/middleware';
-import { NextApiRequestQueryBody } from 'lib/types';
+import { NextApiRequestQueryBody, SearchFilter, WebsiteSearchFilterType } from 'lib/types';
 import { NextApiResponse } from 'next';
 import { methodNotAllowed, ok, unauthorized } from 'next-basics';
 import { createWebsite } from 'queries';
 import userWebsites from 'pages/api/users/[id]/websites';
 
+export interface WebsitesRequestQuery extends SearchFilter<WebsiteSearchFilterType> {}
+
 export interface WebsitesRequestBody {
   name: string;
   domain: string;
@@ -14,7 +16,7 @@ export interface WebsitesRequestBody {
 }
 
 export default async (
-  req: NextApiRequestQueryBody<any, WebsitesRequestBody>,
+  req: NextApiRequestQueryBody<WebsitesRequestQuery, WebsitesRequestBody>,
   res: NextApiResponse,
 ) => {
   await useCors(req, res);
@@ -26,6 +28,7 @@ export default async (
 
   if (req.method === 'GET') {
     req.query.id = userId;
+    req.query.pageSize = 100;
 
     return userWebsites(req, res);
   }
diff --git a/pages/reports/index.js b/pages/reports/index.js
new file mode 100644
index 0000000000..ff3b4e8625
--- /dev/null
+++ b/pages/reports/index.js
@@ -0,0 +1,13 @@
+import AppLayout from 'components/layout/AppLayout';
+import ReportsPage from 'components/pages/reports/ReportsPage';
+import { useMessages } from 'hooks';
+
+export default function () {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <AppLayout title={formatMessage(labels.reports)}>
+      <ReportsPage />
+    </AppLayout>
+  );
+}
diff --git a/pages/reports/retention.js b/pages/reports/retention.js
new file mode 100644
index 0000000000..b7f0bd0f89
--- /dev/null
+++ b/pages/reports/retention.js
@@ -0,0 +1,13 @@
+import AppLayout from 'components/layout/AppLayout';
+import RetentionReport from 'components/pages/reports/retention/RetentionReport';
+import useMessages from 'hooks/useMessages';
+
+export default function () {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <AppLayout title={`${formatMessage(labels.retention)} - ${formatMessage(labels.reports)}`}>
+      <RetentionReport />
+    </AppLayout>
+  );
+}
diff --git a/pages/websites/index.js b/pages/websites/index.js
new file mode 100644
index 0000000000..42a327bccd
--- /dev/null
+++ b/pages/websites/index.js
@@ -0,0 +1,13 @@
+import AppLayout from 'components/layout/AppLayout';
+import WebsitesPage from 'components/pages/websites/WebsitesPage';
+import useMessages from 'hooks/useMessages';
+
+export default function () {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <AppLayout title={formatMessage(labels.websites)}>
+      <WebsitesPage />
+    </AppLayout>
+  );
+}
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
index 36a3bb8c64..29d134eef8 100644
Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ
diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
index aa9bebab86..e9253204be 100644
Binary files a/public/android-chrome-512x512.png and b/public/android-chrome-512x512.png differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index 16842d3c18..575bba77b6 100644
Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
index 9d08d9963a..549642460f 100644
Binary files a/public/favicon-16x16.png and b/public/favicon-16x16.png differ
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
index 3f2e4c1f71..ec5ecedae5 100644
Binary files a/public/favicon-32x32.png and b/public/favicon-32x32.png differ
diff --git a/public/images/browsers/android.png b/public/images/browsers/android.png
index 6e28498d2c..393001a017 100644
Binary files a/public/images/browsers/android.png and b/public/images/browsers/android.png differ
diff --git a/public/images/browsers/aol.png b/public/images/browsers/aol.png
index 66dc4288e6..3b6f962f79 100644
Binary files a/public/images/browsers/aol.png and b/public/images/browsers/aol.png differ
diff --git a/public/images/browsers/beaker.png b/public/images/browsers/beaker.png
index fbc997cd88..8d4e61d690 100644
Binary files a/public/images/browsers/beaker.png and b/public/images/browsers/beaker.png differ
diff --git a/public/images/browsers/blackberry.png b/public/images/browsers/blackberry.png
index 74f255cb90..11ccd83646 100644
Binary files a/public/images/browsers/blackberry.png and b/public/images/browsers/blackberry.png differ
diff --git a/public/images/browsers/curl.png b/public/images/browsers/curl.png
index dd22192733..cc0a617afb 100644
Binary files a/public/images/browsers/curl.png and b/public/images/browsers/curl.png differ
diff --git a/public/images/browsers/edge.png b/public/images/browsers/edge.png
index 3881a7e0a7..2da3aaffe8 100644
Binary files a/public/images/browsers/edge.png and b/public/images/browsers/edge.png differ
diff --git a/public/images/browsers/instagram.png b/public/images/browsers/instagram.png
index 5961a6b3b4..8377710a10 100644
Binary files a/public/images/browsers/instagram.png and b/public/images/browsers/instagram.png differ
diff --git a/public/images/browsers/ios-webview.png b/public/images/browsers/ios-webview.png
index 5f2dd40196..bf7c362e53 100644
Binary files a/public/images/browsers/ios-webview.png and b/public/images/browsers/ios-webview.png differ
diff --git a/public/images/browsers/ios.png b/public/images/browsers/ios.png
index 5f2dd40196..114bf554c5 100644
Binary files a/public/images/browsers/ios.png and b/public/images/browsers/ios.png differ
diff --git a/public/images/browsers/miui.png b/public/images/browsers/miui.png
index 5f929510f9..1534a0ca12 100644
Binary files a/public/images/browsers/miui.png and b/public/images/browsers/miui.png differ
diff --git a/public/images/browsers/searchbot.png b/public/images/browsers/searchbot.png
index 46a33055cf..43b1dff996 100644
Binary files a/public/images/browsers/searchbot.png and b/public/images/browsers/searchbot.png differ
diff --git a/public/images/os/amazon-os.png b/public/images/os/amazon-os.png
index 9b18cf0fd3..030e72f6d0 100644
Binary files a/public/images/os/amazon-os.png and b/public/images/os/amazon-os.png differ
diff --git a/public/images/os/android-os.png b/public/images/os/android-os.png
index fc6509b361..21ea3445ed 100644
Binary files a/public/images/os/android-os.png and b/public/images/os/android-os.png differ
diff --git a/public/images/os/beos.png b/public/images/os/beos.png
index 6bc4a8a5c5..8e852b0fc8 100644
Binary files a/public/images/os/beos.png and b/public/images/os/beos.png differ
diff --git a/public/images/os/blackberry-os.png b/public/images/os/blackberry-os.png
index c77db52541..093a8a4003 100644
Binary files a/public/images/os/blackberry-os.png and b/public/images/os/blackberry-os.png differ
diff --git a/public/images/os/ios.png b/public/images/os/ios.png
index 1c129ae84c..7e803a6906 100644
Binary files a/public/images/os/ios.png and b/public/images/os/ios.png differ
diff --git a/public/images/os/linux.png b/public/images/os/linux.png
index ce8fba38e1..d5c1bd8b7e 100644
Binary files a/public/images/os/linux.png and b/public/images/os/linux.png differ
diff --git a/public/images/os/mac-os.png b/public/images/os/mac-os.png
index 1972abe755..e57d01cf21 100644
Binary files a/public/images/os/mac-os.png and b/public/images/os/mac-os.png differ
diff --git a/public/images/os/open-bsd.png b/public/images/os/open-bsd.png
index 806887e83f..b3423ccee0 100644
Binary files a/public/images/os/open-bsd.png and b/public/images/os/open-bsd.png differ
diff --git a/public/images/os/os-2.png b/public/images/os/os-2.png
index 5f88105dac..8f51e6183f 100644
Binary files a/public/images/os/os-2.png and b/public/images/os/os-2.png differ
diff --git a/public/images/os/qnx.png b/public/images/os/qnx.png
index 59d9a44c43..1cf10fe57d 100644
Binary files a/public/images/os/qnx.png and b/public/images/os/qnx.png differ
diff --git a/public/images/os/sun-os.png b/public/images/os/sun-os.png
index c19f0eb399..648eb24175 100644
Binary files a/public/images/os/sun-os.png and b/public/images/os/sun-os.png differ
diff --git a/public/images/os/windows-2000.png b/public/images/os/windows-2000.png
index 3bccae3fb1..8ec7db1876 100644
Binary files a/public/images/os/windows-2000.png and b/public/images/os/windows-2000.png differ
diff --git a/public/images/os/windows-3-11.png b/public/images/os/windows-3-11.png
index 3bccae3fb1..8ec7db1876 100644
Binary files a/public/images/os/windows-3-11.png and b/public/images/os/windows-3-11.png differ
diff --git a/public/images/os/windows-7.png b/public/images/os/windows-7.png
index cd2db79e40..4a899a30f8 100644
Binary files a/public/images/os/windows-7.png and b/public/images/os/windows-7.png differ
diff --git a/public/images/os/windows-8-1.png b/public/images/os/windows-8-1.png
index 3ce98aaaf9..f6605f4c53 100644
Binary files a/public/images/os/windows-8-1.png and b/public/images/os/windows-8-1.png differ
diff --git a/public/images/os/windows-8.png b/public/images/os/windows-8.png
index 3ce98aaaf9..f6605f4c53 100644
Binary files a/public/images/os/windows-8.png and b/public/images/os/windows-8.png differ
diff --git a/public/images/os/windows-95.png b/public/images/os/windows-95.png
index 3bccae3fb1..8ec7db1876 100644
Binary files a/public/images/os/windows-95.png and b/public/images/os/windows-95.png differ
diff --git a/public/images/os/windows-98.png b/public/images/os/windows-98.png
index 3bccae3fb1..8ec7db1876 100644
Binary files a/public/images/os/windows-98.png and b/public/images/os/windows-98.png differ
diff --git a/public/images/os/windows-me.png b/public/images/os/windows-me.png
index cd2db79e40..4a899a30f8 100644
Binary files a/public/images/os/windows-me.png and b/public/images/os/windows-me.png differ
diff --git a/public/images/os/windows-server-2003.png b/public/images/os/windows-server-2003.png
index cd2db79e40..4a899a30f8 100644
Binary files a/public/images/os/windows-server-2003.png and b/public/images/os/windows-server-2003.png differ
diff --git a/public/images/os/windows-vista.png b/public/images/os/windows-vista.png
index cd2db79e40..4a899a30f8 100644
Binary files a/public/images/os/windows-vista.png and b/public/images/os/windows-vista.png differ
diff --git a/public/images/os/windows-xp.png b/public/images/os/windows-xp.png
index cd2db79e40..4a899a30f8 100644
Binary files a/public/images/os/windows-xp.png and b/public/images/os/windows-xp.png differ
diff --git a/public/intl/country/my-MM.json b/public/intl/country/my-MM.json
new file mode 100644
index 0000000000..e233349e2a
--- /dev/null
+++ b/public/intl/country/my-MM.json
@@ -0,0 +1,251 @@
+{
+  "CA": "\u1000\u1014\u1031\u1012\u102b",
+  "KG": "\u1000\u102c\u1002\u103b\u1005\u1039\u1005\u1010\u1014\u103a",
+  "KZ": "\u1000\u102c\u1007\u1000\u103a\u1005\u1010\u1014\u103a",
+  "QA": "\u1000\u102c\u1010\u102c",
+  "BQ": "\u1000\u102c\u101b\u1005\u103a\u1018\u102e\u101a\u1036 \u1014\u101a\u103a\u101e\u102c\u101c\u1014\u103a",
+  "KW": "\u1000\u1030\u101d\u102d\u1010\u103a",
+  "KY": "\u1000\u1031\u1019\u1014\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "CC": "\u1000\u102d\u102f\u1000\u102d\u102f\u1038\u1000\u103b\u103d\u1014\u103a\u1038",
+  "KM": "\u1000\u102d\u102f\u1019\u102d\u102f\u101b\u102d\u102f\u1005\u103a",
+  "CO": "\u1000\u102d\u102f\u101c\u1036\u1018\u102e\u101a\u102c",
+  "CR": "\u1000\u102d\u102f\u1037\u1005\u103a\u1010\u102c\u101b\u102e\u1000\u102c",
+  "CI": "\u1000\u102d\u102f\u1037\u1010\u103a \u1012\u102e\u1017\u103d\u102c",
+  "KE": "\u1000\u1004\u103a\u100a\u102c",
+  "CM": "\u1000\u1004\u103a\u1019\u101b\u103d\u1014\u103a\u1038",
+  "CV": "\u1000\u102d\u1010\u103a\u1017\u102c\u1012\u102e",
+  "KH": "\u1000\u1019\u1039\u1018\u1031\u102c\u1012\u102e\u1038\u101a\u102c\u1038",
+  "CW": "\u1000\u103b\u1030\u101b\u1031\u1038\u1000\u102d\u102f\u1038\u1005\u103a",
+  "CU": "\u1000\u103b\u1030\u1038\u1018\u102c\u1038",
+  "CK": "\u1000\u103d\u1010\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "CD": "\u1000\u103d\u1014\u103a\u1002\u102d\u102f",
+  "CG": "\u1000\u103d\u1014\u103a\u1002\u102d\u102f-\u1018\u101b\u102c\u1007\u102c\u1017\u102e\u1038\u101c\u103a",
+  "HR": "\u1001\u101b\u102d\u102f\u1021\u1031\u1038\u101b\u103e\u102c\u1038",
+  "CX": "\u1001\u101b\u1005\u103a\u1005\u1019\u1010\u103a \u1000\u103b\u103d\u1014\u103a\u1038",
+  "KI": "\u1001\u102e\u101b\u102e\u1018\u102c\u1010\u102e",
+  "CL": "\u1001\u103b\u102e\u101c\u102e",
+  "CZ": "\u1001\u103b\u1000\u103a\u1000\u102e\u101a\u102c\u1038",
+  "TD": "\u1001\u103b\u1012\u103a",
+  "GR": "\u1002\u101b\u102d",
+  "GD": "\u1002\u101b\u102e\u1014\u1031\u1012\u102b",
+  "GL": "\u1002\u101b\u1004\u103a\u1038\u101c\u1014\u103a\u1038",
+  "GH": "\u1002\u102b\u1014\u102c",
+  "GA": "\u1002\u102b\u1018\u103d\u1014\u103a",
+  "GN": "\u1002\u102e\u1014\u102e",
+  "GW": "\u1002\u102e\u1014\u102e-\u1018\u102e\u1005\u1031\u102c",
+  "GU": "\u1002\u1030\u1021\u1019\u103a",
+  "GY": "\u1002\u102d\u102f\u1004\u103a\u101a\u102c\u1014\u102c",
+  "GM": "\u1002\u1019\u103a\u1018\u102e\u101b\u102c",
+  "JP": "\u1002\u103b\u1015\u1014\u103a",
+  "JM": "\u1002\u103b\u1019\u1031\u1000\u102c",
+  "JE": "\u1002\u103b\u102c\u1005\u102e",
+  "DE": "\u1002\u103b\u102c\u1019\u1014\u102e",
+  "GI": "\u1002\u103b\u102e\u1018\u101b\u1031\u102c\u103a\u101c\u103a\u1010\u102c",
+  "DJ": "\u1002\u103b\u102e\u1018\u1030\u1010\u102e",
+  "GE": "\u1002\u103b\u1031\u102c\u103a\u1002\u103b\u102e\u101a\u102c",
+  "JO": "\u1002\u103b\u1031\u102c\u103a\u1012\u1014\u103a",
+  "GT": "\u1002\u103d\u102b\u1010\u102e\u1019\u102c\u101c\u102c",
+  "GP": "\u1002\u103d\u102b\u1012\u102e\u101c\u102f",
+  "GG": "\u1002\u103d\u1014\u103a\u1038\u1007\u102e",
+  "ES": "\u1005\u1015\u102d\u1014\u103a",
+  "SJ": "\u1005\u1017\u102d\u102f\u101c\u103a\u1018\u1010\u103a\u1014\u103e\u1004\u1037\u103a\u1002\u103b\u1014\u103a\u1019\u1031\u101b\u1014\u103a",
+  "KN": "\u1005\u102d\u1014\u1037\u103a\u1000\u1005\u103a\u1014\u103e\u1004\u1037\u103a\u1014\u102e\u1017\u102e\u1005\u103a",
+  "PM": "\u1005\u102d\u1014\u1037\u103a\u1015\u102e\u1021\u1032\u101b\u103a\u1014\u103e\u1004\u1037\u103a \u1019\u102e\u1000\u103d\u102e\u101c\u103d\u1014\u103a",
+  "VC": "\u1005\u102d\u1014\u1037\u103a\u1017\u1004\u103a\u1038\u1006\u1004\u1037\u103a\u1014\u103e\u1004\u1037\u103a \u1002\u101b\u102d\u1014\u1031\u1012\u102d\u102f\u1004\u103a",
+  "BL": "\u1005\u102d\u1014\u1037\u103a\u1018\u102c\u101e\u101a\u103a\u101c\u103a\u1019\u102e",
+  "MF": "\u1005\u102d\u1014\u1037\u103a\u1019\u102c\u1010\u1004\u103a",
+  "LC": "\u1005\u102d\u1014\u1037\u103a\u101c\u1030\u1005\u102e\u101a\u102c",
+  "SH": "\u1005\u102d\u1014\u1037\u103a\u101f\u101a\u103a\u101c\u101a\u103a\u1014\u102c",
+  "SG": "\u1005\u1004\u103a\u1039\u1000\u102c\u1015\u1030",
+  "SX": "\u1005\u1004\u1037\u103a\u1019\u102c\u1010\u1004\u103a",
+  "WS": "\u1006\u1019\u102d\u102f\u1038\u1021\u102c\u1038",
+  "SI": "\u1006\u101c\u102d\u102f\u1017\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "SK": "\u1006\u101c\u102d\u102f\u1017\u1000\u103a\u1000\u102e\u1038\u101a\u102c\u1038",
+  "RS": "\u1006\u102c\u1038\u1018\u102e\u1038\u101a\u102c\u1038",
+  "SN": "\u1006\u102e\u1014\u102e\u1002\u1031\u102b",
+  "SL": "\u1006\u102e\u101a\u102c\u101b\u102c \u101c\u102e\u101a\u103d\u1014\u103a\u1038",
+  "SY": "\u1006\u102e\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "SD": "\u1006\u1030\u1012\u1014\u103a",
+  "SR": "\u1006\u1030\u101b\u102c\u1014\u1019\u103a",
+  "SC": "\u1006\u1031\u1038\u101b\u103e\u1032",
+  "SA": "\u1006\u1031\u102c\u103a\u1012\u102e\u1021\u102c\u101b\u1031\u1038\u1018\u102e\u1038\u101a\u102c\u1038",
+  "SB": "\u1006\u1031\u102c\u103a\u101c\u1019\u103d\u1014\u103a\u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "SO": "\u1006\u102d\u102f\u1019\u102c\u101c\u102e\u101a\u102c",
+  "CY": "\u1006\u102d\u102f\u1000\u103a\u1015\u101b\u1015\u103a\u1005\u103a",
+  "ST": "\u1006\u1031\u102c\u1004\u103a\u1010\u1030\u1019\u1031\u1038\u1014\u103e\u1004\u1037\u103a \u1015\u101b\u1004\u103a\u1005\u102e\u1015\u102e",
+  "SM": "\u1006\u1014\u103a\u1019\u102c\u101b\u102e\u1014\u102d\u102f",
+  "SZ": "\u1006\u103d\u102c\u1007\u102e\u101c\u1014\u103a",
+  "SE": "\u1006\u103d\u102e\u1012\u1004\u103a",
+  "CH": "\u1006\u103d\u1005\u103a\u1007\u102c\u101c\u1014\u103a",
+  "ZW": "\u1007\u1004\u103a\u1018\u102c\u1018\u103d\u1031",
+  "ZM": "\u1007\u1019\u103a\u1018\u102e\u101a\u102c",
+  "CN": "\u1010\u101b\u102f\u1010\u103a",
+  "TJ": "\u1010\u102c\u1002\u103b\u102e\u1000\u1005\u1039\u1005\u1010\u1014\u103a",
+  "TM": "\u1010\u102c\u1037\u1001\u103a\u1019\u1004\u103a\u1014\u1005\u1039\u1005\u1010\u1014\u103a",
+  "TN": "\u1010\u1030\u1014\u102e\u1038\u101b\u103e\u102c\u1038",
+  "TV": "\u1010\u1030\u1017\u102c\u1038\u101c\u1030",
+  "TR": "\u1010\u1030\u101b\u1000\u102e",
+  "TK": "\u1010\u102d\u102f\u1000\u101c\u1031\u102c\u1004\u103a",
+  "TG": "\u1010\u102d\u102f\u1002\u102d\u102f",
+  "TC": "\u1010\u1001\u103a\u1005\u103a\u1014\u103e\u1004\u1037\u103a\u1000\u102c\u1021\u102e\u1000\u102d\u102f\u1005\u103a\u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "GS": "\u1010\u1031\u102c\u1004\u103a \u1002\u103b\u1031\u102c\u103a\u1002\u103b\u102e\u101a\u102c \u1014\u103e\u1004\u1037\u103a \u1010\u1031\u102c\u1004\u103a \u1006\u1004\u103a\u1038\u1012\u101d\u1005\u103a\u1002\u103b\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f\u1019\u103b\u102c\u1038",
+  "SS": "\u1010\u1031\u102c\u1004\u103a \u1006\u1030\u1012\u1014\u103a",
+  "KR": "\u1010\u1031\u102c\u1004\u103a\u1000\u102d\u102f\u101b\u102e\u1038\u101a\u102c\u1038",
+  "ZA": "\u1010\u1031\u102c\u1004\u103a\u1021\u102c\u1016\u101b\u102d\u1000",
+  "TZ": "\u1010\u1014\u103a\u1007\u1014\u103a\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "TO": "\u1010\u103d\u1014\u103a\u1002\u102b",
+  "TT": "\u1011\u101b\u102e\u1014\u102e\u1012\u1010\u103a\u1014\u103e\u1004\u1037\u103a \u1010\u102d\u102f\u1018\u1000\u103a\u1002\u102d\u102f",
+  "TW": "\u1011\u102d\u102f\u1004\u103a\u101d\u1019\u103a",
+  "TH": "\u1011\u102d\u102f\u1004\u103a\u1038",
+  "DM": "\u1012\u102d\u102f\u1019\u102e\u1014\u102e\u1000\u102c",
+  "DO": "\u1012\u102d\u102f\u1019\u102e\u1014\u102e\u1000\u1014\u103a",
+  "DK": "\u1012\u102d\u1014\u103a\u1038\u1019\u1010\u103a",
+  "NA": "\u1014\u1019\u102e\u1038\u1018\u102e\u1038\u101a\u102c\u1038",
+  "NC": "\u1014\u101a\u1030\u1038 \u1000\u101a\u103a\u101c\u102e\u1012\u102d\u102f\u1014\u102e\u1038\u101a\u102c\u1038",
+  "NZ": "\u1014\u101a\u1030\u1038\u1007\u102e\u101c\u1014\u103a",
+  "NI": "\u1014\u102e\u1000\u102c\u101b\u102c\u1002\u103d\u102b",
+  "NP": "\u1014\u102e\u1015\u1031\u102b",
+  "NU": "\u1014\u102e\u1025\u1030\u1021\u1031",
+  "NF": "\u1014\u1031\u102c\u1016\u102f\u1010\u103a\u1000\u103b\u103d\u1014\u103a\u1038",
+  "NR": "\u1014\u1031\u102c\u103a\u101b\u1030\u1038",
+  "NO": "\u1014\u1031\u102c\u103a\u101d\u1031",
+  "NE": "\u1014\u102d\u102f\u1004\u103a\u1002\u103b\u102c",
+  "NG": "\u1014\u102d\u102f\u1004\u103a\u1002\u103b\u102e\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "NL": "\u1014\u101a\u103a\u101e\u102c\u101c\u1014\u103a",
+  "PA": "\u1015\u1014\u102c\u1038\u1019\u102c\u1038",
+  "PW": "\u1015\u101c\u102c\u1021\u102d\u102f",
+  "PK": "\u1015\u102b\u1000\u1005\u1039\u1005\u1010\u1014\u103a",
+  "PG": "\u1015\u102b\u1015\u1030\u1021\u102c \u1014\u101a\u1030\u1038\u1002\u102e\u1014\u102e",
+  "PY": "\u1015\u102b\u101b\u102c\u1002\u103d\u1031\u1038",
+  "PS": "\u1015\u102b\u101c\u1000\u103a\u1005\u1010\u102d\u102f\u1004\u103a\u1038 \u1015\u102d\u102f\u1004\u103a\u1014\u1000\u103a",
+  "PE": "\u1015\u102e\u101b\u1030\u1038",
+  "PT": "\u1015\u1031\u102b\u103a\u1010\u1030\u1002\u102e",
+  "PR": "\u1015\u1031\u102b\u103a\u1010\u102d\u102f\u101b\u102e\u1000\u102d\u102f",
+  "PL": "\u1015\u102d\u102f\u101c\u1014\u103a",
+  "PN": "\u1015\u1005\u103a\u1010\u103a\u1000\u102d\u1014\u103a\u1038\u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "FR": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a",
+  "GF": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a \u1002\u102e\u101a\u102c\u1014\u102c",
+  "TF": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a \u1010\u1031\u102c\u1004\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1015\u102d\u102f\u1004\u103a\u1014\u1000\u103a\u1019\u103b\u102c\u1038",
+  "PF": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a \u1015\u1031\u102b\u103a\u101c\u102e\u1014\u102e\u1038\u101b\u103e\u102c\u1038",
+  "FO": "\u1016\u102c\u101b\u102d\u102f\u1038 \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f\u1019\u103b\u102c\u1038",
+  "PH": "\u1016\u102d\u101c\u1005\u103a\u1015\u102d\u102f\u1004\u103a",
+  "FJ": "\u1016\u102e\u1002\u103b\u102e",
+  "FK": "\u1016\u1031\u102c\u1037\u1000\u101c\u1014\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "FI": "\u1016\u1004\u103a\u101c\u1014\u103a",
+  "VU": "\u1017\u1014\u103d\u102c\u1038\u1010\u1030",
+  "CF": "\u1017\u101f\u102d\u102f \u1021\u102c\u1016\u101b\u102d\u1000 \u1015\u103c\u100a\u103a\u1011\u1031\u102c\u1004\u103a\u1005\u102f",
+  "VA": "\u1017\u102c\u1010\u102e\u1000\u1014\u103a\u1005\u102e\u1038\u1010\u102e\u1038",
+  "VN": "\u1017\u102e\u101a\u1000\u103a\u1014\u1019\u103a",
+  "VE": "\u1017\u1004\u103a\u1014\u102e\u1007\u103d\u1032\u101c\u102c\u1038",
+  "VG": "\u1017\u103c\u102d\u1010\u102d\u101e\u103b\u103e \u1017\u102c\u1002\u103b\u1004\u103a\u1038 \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "IO": "\u1017\u103c\u102d\u1010\u102d\u101e\u103b\u103e\u1015\u102d\u102f\u1004\u103a \u1021\u102d\u1014\u1039\u1012\u102d\u101a\u101e\u1019\u102f\u1012\u1039\u1012\u101b\u102c\u1000\u103b\u103d\u1014\u103a\u1038\u1019\u103b\u102c\u1038",
+  "BR": "\u1018\u101b\u102c\u1007\u102e\u1038",
+  "BN": "\u1018\u101b\u1030\u1014\u102d\u102f\u1004\u103a\u1038",
+  "BZ": "\u1018\u101c\u102d\u1007\u103a",
+  "BS": "\u1018\u101f\u102c\u1038\u1019\u102c\u1038",
+  "BF": "\u1018\u102c\u1000\u102e\u1038\u1014\u102c\u1038 \u1016\u102c\u1038\u1006\u102d\u102f",
+  "BB": "\u1018\u102c\u1018\u1031\u1038\u1012\u102d\u102f\u1038\u1005\u103a",
+  "BM": "\u1018\u102c\u1019\u103c\u1030\u1012\u102b",
+  "BH": "\u1018\u102c\u101b\u102d\u1014\u103a\u1038",
+  "BJ": "\u1018\u102e\u1014\u1004\u103a",
+  "BY": "\u1018\u102e\u101c\u102c\u101b\u102f\u1005\u103a",
+  "BT": "\u1018\u1030\u1010\u1014\u103a",
+  "BV": "\u1018\u1030\u1017\u1000\u103a\u1000\u103b\u103d\u1014\u103a\u1038",
+  "BI": "\u1018\u1030\u101b\u103d\u1014\u103a\u1012\u102e",
+  "BG": "\u1018\u1030\u101c\u103a\u1002\u1031\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "BA": "\u1018\u1031\u102c\u1037\u1005\u1014\u102e\u1038\u101a\u102c\u1038\u1014\u103e\u1004\u1037\u103a \u101f\u102c\u1007\u102e\u1002\u102d\u102f\u1017\u102e\u1014\u102c\u1038",
+  "BW": "\u1018\u1031\u102c\u1037\u1006\u103d\u102c\u1014\u102c",
+  "BO": "\u1018\u102d\u102f\u101c\u102e\u1038\u1017\u102e\u1038\u101a\u102c\u1038",
+  "BD": "\u1018\u1004\u103a\u1039\u1002\u101c\u102c\u1038\u1012\u1031\u1037\u101b\u103e\u103a",
+  "BE": "\u1018\u101a\u103a\u101c\u103a\u1002\u103b\u102e\u101a\u1019\u103a",
+  "MO": "\u1019\u1000\u102c\u1021\u102d\u102f (\u1010\u101b\u102f\u1010\u103a\u1015\u103c\u100a\u103a)",
+  "MG": "\u1019\u1012\u102b\u1002\u1010\u103a\u1005\u1000\u102c\u1038",
+  "MY": "\u1019\u101c\u1031\u1038\u101b\u103e\u102c\u1038",
+  "MQ": "\u1019\u102c\u1010\u102e\u1014\u102d\u1001\u103a",
+  "MH": "\u1019\u102c\u101b\u103e\u101a\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "MW": "\u1019\u102c\u101c\u102c\u101d\u102e",
+  "ML": "\u1019\u102c\u101c\u102e",
+  "YT": "\u1019\u1031\u101a\u1031\u102c\u1037",
+  "MU": "\u1019\u1031\u102c\u101b\u1005\u103a\u101b\u103e",
+  "MS": "\u1019\u1031\u102c\u1004\u1037\u103a\u1005\u1032\u101b\u1000\u103a",
+  "MR": "\u1019\u1031\u102c\u103a\u101b\u102e\u1010\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "MA": "\u1019\u1031\u102c\u103a\u101b\u102d\u102f\u1000\u102d\u102f",
+  "MV": "\u1019\u1031\u102c\u103a\u101c\u103a\u1012\u102d\u102f\u1000\u103a",
+  "MZ": "\u1019\u102d\u102f\u1007\u1019\u103a\u1018\u1005\u103a",
+  "MC": "\u1019\u102d\u102f\u1014\u102c\u1000\u102d\u102f",
+  "MX": "\u1019\u1000\u103a\u1000\u1006\u102e\u1000\u102d\u102f",
+  "FM": "\u1019\u102d\u102f\u1004\u103a\u1001\u101b\u102d\u102f\u1014\u102e\u101b\u103e\u102c\u1038",
+  "IM": "\u1019\u1014\u103a\u1000\u103b\u103d\u1014\u103a\u1038",
+  "MT": "\u1019\u1031\u102c\u101c\u103a\u1010\u102c",
+  "MD": "\u1019\u1031\u102c\u101c\u103a\u1012\u102d\u102f\u1017\u102c",
+  "MK": "\u1019\u103c\u1031\u102c\u1000\u103a \u1019\u1000\u103a\u1006\u102e\u1012\u102d\u102f\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "KP": "\u1019\u103c\u1031\u102c\u1000\u103a\u1000\u102d\u102f\u101b\u102e\u1038\u101a\u102c\u1038",
+  "MP": "\u1019\u103c\u1031\u102c\u1000\u103a\u1015\u102d\u102f\u1004\u103a\u1038\u1019\u102c\u101b\u102e\u1021\u102c\u1014\u102c\u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "MM": "\u1019\u103c\u1014\u103a\u1019\u102c",
+  "MN": "\u1019\u103d\u1014\u103a\u1002\u102d\u102f\u1038\u101c\u102e\u1038\u101a\u102c\u1038",
+  "ME": "\u1019\u103d\u1014\u103a\u1010\u102e\u1014\u102d\u1002\u101b\u102d\u102f\u1038",
+  "YE": "\u101a\u102e\u1019\u1004\u103a",
+  "UA": "\u101a\u1030\u1000\u101b\u102d\u1014\u103a\u1038",
+  "UG": "\u101a\u1030\u1002\u1014\u103a\u1038\u1012\u102b\u1038",
+  "GB": "\u101a\u1030\u1014\u102d\u102f\u1000\u103a\u1010\u1000\u103a\u1000\u1004\u103a\u1038\u1012\u1019\u103a\u1038",
+  "UM": "\u101a\u1030\u1014\u102d\u102f\u1000\u103a\u1010\u1000\u103a\u1005\u1010\u102d\u1010\u103a \u1000\u103b\u103d\u1014\u103a\u1038\u1014\u102d\u102f\u1004\u103a\u1004\u1036\u1019\u103b\u102c\u1038",
+  "AE": "\u101a\u1030\u1021\u1031\u1021\u102e\u1038",
+  "VI": "\u101a\u1030\u1021\u1000\u103a\u1005\u103a \u1017\u102c\u1002\u103b\u1004\u103a\u1038 \u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "RW": "\u101b\u101d\u1014\u103a\u1012\u102b",
+  "RE": "\u101b\u102e\u101a\u1030\u1014\u102e\u101a\u1014\u103a",
+  "RU": "\u101b\u102f\u101b\u103e\u102c\u1038",
+  "RO": "\u101b\u102d\u102f\u1019\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "LA": "\u101c\u102c\u1021\u102d\u102f",
+  "LS": "\u101c\u102e\u1006\u102d\u102f\u101e\u102d\u102f",
+  "LU": "\u101c\u1030\u1007\u1004\u103a\u1018\u1010\u103a",
+  "LB": "\u101c\u1000\u103a\u1018\u1014\u103d\u1014\u103a",
+  "LR": "\u101c\u102d\u102f\u1000\u103a\u1018\u1031\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "LI": "\u101c\u1005\u103a\u1010\u1014\u103a\u1005\u1010\u102d\u1014\u103a\u1038",
+  "LY": "\u101c\u1005\u103a\u1017\u103b\u102c\u1038",
+  "LT": "\u101c\u1005\u103a\u101e\u1030\u101a\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "LV": "\u101c\u1010\u103a\u1017\u102e\u1038\u101a\u102c\u1038",
+  "WF": "\u101d\u1031\u102b\u101c\u1005\u103a\u1014\u103e\u1004\u1037\u103a \u1016\u1030\u1000\u103b\u1030\u1038\u1014\u102c\u1038",
+  "LK": "\u101e\u102e\u101b\u102d\u101c\u1004\u103a\u1039\u1000\u102c",
+  "HT": "\u101f\u1031\u1010\u102e",
+  "HK": "\u101f\u1031\u102c\u1004\u103a\u1000\u1031\u102c\u1004\u103a (\u1010\u101b\u102f\u1010\u103a\u1015\u103c\u100a\u103a)",
+  "HM": "\u101f\u1010\u103a\u1000\u103b\u103d\u1014\u103a\u1038\u1014\u103e\u1004\u1037\u103a\u1019\u1000\u103a\u1012\u1031\u102b\u1014\u101a\u103a\u1000\u103b\u103d\u1014\u103a\u1038\u1005\u102f",
+  "HU": "\u101f\u1014\u103a\u1002\u1031\u101b\u102e",
+  "HN": "\u101f\u103d\u1014\u103a\u1012\u1030\u1038\u101b\u1015\u103a\u1005\u103a",
+  "AZ": "\u1021\u1007\u102c\u1018\u102d\u102f\u1004\u103a\u1002\u103b\u1014\u103a",
+  "EH": "\u1021\u1014\u1031\u102c\u1000\u103a \u1006\u102c\u101f\u102c\u101b",
+  "AS": "\u1021\u1019\u1031\u101b\u102d\u1000\u1014\u103a \u1006\u1019\u102d\u102f\u1038\u1021\u102c\u1038",
+  "US": "\u1021\u1019\u1031\u101b\u102d\u1000\u1014\u103a \u1015\u103c\u100a\u103a\u1011\u1031\u102c\u1004\u103a\u1005\u102f",
+  "TL": "\u1021\u101b\u103e\u1031\u1037\u1010\u102e\u1019\u1031\u102c",
+  "AR": "\u1021\u102c\u1002\u103b\u1004\u103a\u1010\u102e\u1038\u1014\u102c\u1038",
+  "AF": "\u1021\u102c\u1016\u1002\u1014\u103a\u1014\u1005\u1039\u1005\u1010\u1014\u103a",
+  "AM": "\u1021\u102c\u1019\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "AW": "\u1021\u102c\u101b\u1030\u1038\u1017\u102c\u1038",
+  "AX": "\u1021\u102c\u101c\u1014\u103a\u1000\u103b\u103d\u1014\u103a\u1038",
+  "GQ": "\u1021\u102e\u1000\u103d\u1031\u1010\u102c \u1002\u102e\u1014\u102e",
+  "EC": "\u1021\u102e\u1000\u103d\u1031\u1012\u1031\u102b",
+  "EG": "\u1021\u102e\u1002\u103b\u1005\u103a",
+  "IT": "\u1021\u102e\u1010\u101c\u102e",
+  "ER": "\u1021\u102e\u101b\u102e\u1011\u101b\u102e\u1038\u101a\u102c\u1038",
+  "IQ": "\u1021\u102e\u101b\u1010\u103a",
+  "IR": "\u1021\u102e\u101b\u1014\u103a",
+  "ET": "\u1021\u102e\u101e\u102e\u101a\u102d\u102f\u1038\u1015\u102e\u1038\u101a\u102c\u1038",
+  "UZ": "\u1025\u1007\u1018\u1000\u103a\u1000\u1005\u1039\u1005\u1010\u1014\u103a",
+  "UY": "\u1025\u101b\u102f\u1002\u103d\u1031\u1038",
+  "AT": "\u1029\u1005\u1010\u103c\u102e\u1038\u101a\u102c\u1038",
+  "AU": "\u1029\u1005\u1010\u103c\u1031\u1038\u101c\u103b",
+  "OM": "\u1021\u102d\u102f\u1019\u1014\u103a",
+  "EE": "\u1021\u1000\u103a\u1005\u1010\u102d\u102f\u1038\u1014\u102e\u1038\u101a\u102c\u1038",
+  "IS": "\u1021\u102d\u102f\u1000\u103a\u1005\u101c\u1014\u103a",
+  "ID": "\u1021\u1004\u103a\u1012\u102d\u102f\u1014\u102e\u1038\u101b\u103e\u102c\u1038",
+  "IE": "\u1021\u102d\u102f\u1004\u103a\u101a\u102c\u101c\u1014\u103a",
+  "IL": "\u1021\u1005\u1039\u1005\u101b\u1031\u1038",
+  "AI": "\u1021\u1014\u103a\u1002\u102e\u101c\u102c",
+  "AO": "\u1021\u1014\u103a\u1002\u102d\u102f\u101c\u102c",
+  "AQ": "\u1021\u1014\u103a\u1010\u102c\u1010\u102d\u1000",
+  "AG": "\u1021\u1014\u103a\u1010\u102e\u1002\u103d\u102b\u1014\u103e\u1004\u1037\u103a \u1018\u102c\u1018\u1030\u1012\u102b",
+  "AD": "\u1021\u1014\u103a\u1012\u102d\u102f\u101b\u102c",
+  "IN": "\u1021\u102d\u1014\u1039\u1012\u102d\u101a",
+  "DZ": "\u1021\u101a\u103a\u101c\u103a\u1002\u103b\u102e\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "SV": "\u1021\u101a\u103a\u101c\u103a\u1006\u102c\u1017\u1031\u1038\u1012\u102d\u102f\u1038",
+  "AL": "\u1021\u101a\u103a\u101c\u103a\u1018\u1031\u1038\u1014\u102e\u1038\u101a\u102c\u1038"
+}
diff --git a/public/intl/language/my-MM.json b/public/intl/language/my-MM.json
new file mode 100644
index 0000000000..e853cde4a7
--- /dev/null
+++ b/public/intl/language/my-MM.json
@@ -0,0 +1,611 @@
+{
+  "kac": "\u1000\u1001\u103b\u1004\u103a",
+  "fr_CA": "\u1000\u1014\u1031\u1012\u102b \u1015\u103c\u1004\u103a\u101e\u1005\u103a",
+  "en_CA": "\u1000\u1014\u1031\u1012\u102b \u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "ca": "\u1000\u102c\u1010\u102c\u101c\u1014\u103a",
+  "koi": "\u1000\u102d\u102f\u1019\u102e-\u1015\u102b\u1019\u103c\u1000\u103a",
+  "ko": "\u1000\u102d\u102f\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "ks": "\u1000\u1000\u103a\u101b\u103e\u103a\u1019\u102e\u101b\u102e",
+  "rw": "\u1000\u1004\u103a\u101b\u102c\u101d\u1014\u103a\u1012\u102b",
+  "ku": "\u1000\u1012\u103a",
+  "kn": "\u1000\u1014\u1039\u1014\u102c\u1012\u102b",
+  "kok": "\u1000\u103d\u1014\u103a\u1000\u1014\u102e",
+  "kg": "\u1000\u103d\u1014\u103a\u1002\u102d\u102f",
+  "kea": "\u1001\u1018\u1030\u1017\u102c\u1012\u102e\u1021\u102c\u1014\u1030",
+  "kab": "\u1001\u1018\u102d\u102f\u1004\u103a\u101c\u103a",
+  "km": "\u1001\u1019\u102c",
+  "cr": "\u1001\u101b\u102e\u1038",
+  "ky": "\u1001\u101b\u1030\u1002\u1005\u103a",
+  "hr": "\u1001\u101b\u102d\u102f\u1021\u1031\u101b\u103e\u1014\u103a",
+  "kl": "\u1001\u101c\u102c\u1021\u103a\u101c\u102e\u1006\u1015\u103a",
+  "kha": "\u1001\u102b\u1005\u102e",
+  "kk": "\u1001\u102b\u1007\u102b\u1001\u103a",
+  "kln": "\u1001\u102b\u101c\u102d\u1019\u103a\u1002\u103b\u1004\u103a",
+  "ki": "\u1001\u102e\u1001\u1030\u101a\u1030",
+  "quc": "\u1001\u102e\u1001\u103a\u1021\u102e\u1001\u103b\u102e",
+  "co": "\u1001\u102d\u102f\u1005\u102e\u1000\u1014\u103a",
+  "kw": "\u1001\u102d\u102f\u1014\u102e\u101b\u103e\u103a",
+  "khq": "\u1001\u102d\u102f\u101b\u102c \u1001\u103b\u102e\u1021\u102e\u1014\u102e",
+  "ses": "\u1001\u102d\u102f\u101b\u102c\u1018\u102d\u102f\u101b\u102d\u102f \u1006\u1019\u103a\u1014\u102e",
+  "qu": "\u1001\u1000\u103a\u1001\u103b\u103a\u101d\u102b",
+  "kam": "\u1001\u1019\u103a\u1018\u102c",
+  "sms": "\u1001\u102d\u102f\u101c\u103a \u1006\u102c\u1019\u102d",
+  "chr": "\u1001\u103b\u102c\u101b\u102d\u102f\u1000\u102e",
+  "cgg": "\u1001\u103b\u102e\u1002\u102b",
+  "ce": "\u1001\u103b\u1031\u1001\u103b\u1004\u103a\u1038",
+  "cs": "\u1001\u103b\u1000\u103a",
+  "swc": "\u1001\u103d\u1014\u103a\u1002\u102d\u102f \u1005\u103d\u102c\u101f\u102e\u101c\u102e",
+  "el": "\u1002\u101b\u102d",
+  "gag": "\u1002\u102b\u1002\u102b\u1007\u103a",
+  "gl": "\u1002\u102b\u101c\u102c\u1005\u102e\u101a\u1036",
+  "gu": "\u1002\u1030\u1002\u103b\u102c\u101b\u101e\u102e",
+  "guz": "\u1002\u1030\u1005\u102e\u1038",
+  "gn": "\u1002\u1030\u1021\u102c\u101b\u102c\u1014\u102e",
+  "lg": "\u1002\u1014\u103a\u1012\u102e",
+  "ja": "\u1002\u103b\u1015\u1014\u103a",
+  "jv": "\u1002\u103b\u102c\u1017\u102c\u1038\u1014\u102e\u1038\u1005\u103a",
+  "de": "\u1002\u103b\u102c\u1019\u1014\u103a",
+  "jpr": "\u1002\u103b\u1030\u1012\u102e\u101a\u102d\u102f-\u1015\u102b\u101b\u103e\u1014\u103a",
+  "jrb": "\u1002\u103b\u1030\u1012\u102e\u101a\u102d\u102f-\u1021\u102c\u101b\u1031\u1017\u103b",
+  "ka": "\u1002\u103b\u1031\u102c\u103a\u1002\u103b\u102e\u101a\u1014\u103a",
+  "dyo": "\u1002\u103b\u102d\u102f\u101c\u102c-\u1016\u103d\u1014\u103a\u101b\u102e",
+  "jgo": "\u1002\u103d\u1019\u103a\u1018\u102c",
+  "sco": "\u1005\u1000\u1031\u102c\u1037",
+  "es": "\u1005\u1015\u102d\u1014\u103a",
+  "es_ES": "\u1005\u1015\u102d\u1014\u103a(\u1025\u101b\u1031\u102c\u1015)",
+  "sl": "\u1005\u101c\u102d\u102f\u1017\u1031\u1038\u1014\u102e\u1038\u101a\u1019\u103a\u1038",
+  "sk": "\u1005\u101c\u102d\u102f\u1017\u1000\u103a",
+  "ii": "\u1005\u102e\u1001\u103b\u103d\u1019\u103a \u101b\u102e",
+  "seh": "\u1005\u102e\u1014\u102c",
+  "sd": "\u1005\u1004\u103a\u1012\u102e",
+  "sr": "\u1006\u102c\u1038\u1017\u102e\u1038\u101a\u1014\u103a\u1038",
+  "su": "\u1006\u1030\u1012\u1014\u103a",
+  "xog": "\u1006\u102d\u102f\u1002\u102b",
+  "so": "\u1006\u102d\u102f\u1019\u102c\u101c\u102e",
+  "ckb": "\u1006\u102d\u102f\u101b\u102c\u1014\u102e \u1000\u1030\u1012\u1005\u103a\u101b\u103e\u103a",
+  "si": "\u1006\u1004\u103a\u101f\u102c\u101c",
+  "sbp": "\u1006\u1014\u103a\u1002\u102f",
+  "saq": "\u1006\u1014\u103a\u1018\u1030\u101b\u102f",
+  "sg": "\u1006\u1019\u103a\u1002\u102d\u102f",
+  "sw": "\u1006\u103c\u102c\u101f\u102e\u101c\u102e",
+  "sv": "\u1006\u103d\u102e\u1012\u1004\u103a",
+  "gsw": "\u1006\u103d\u1005\u103a \u1002\u103b\u102c\u1019\u1014\u103a",
+  "fr_CH": "\u1006\u103d\u1005\u103a \u1015\u103c\u1004\u103a\u101e\u1005\u103a",
+  "de_CH": "\u1006\u103d\u1005\u103a \u1021\u1019\u103c\u1004\u1037\u103a \u1002\u103b\u102c\u1019\u1014\u103a",
+  "dje": "\u1007\u102c\u1019\u102c",
+  "zu": "\u1007\u1030\u101c\u1030",
+  "xh": "\u1007\u102d\u102f\u1005\u102c",
+  "tt": "\u1010\u1010\u102c",
+  "ta": "\u1010\u1019\u102e\u1038\u101c\u103a",
+  "zh": "\u1010\u101b\u102f\u1010\u103a",
+  "tr": "\u1010\u102c\u1000\u1005\u103a",
+  "shi": "\u1010\u102c\u1001\u103b\u101a\u103a\u101c\u103a\u101f\u1005\u103a",
+  "tg": "\u1010\u102c\u1002\u103d\u102e\u1001\u103a",
+  "twq": "\u1010\u102c\u1006\u102c\u101d\u102b\u1001\u103a",
+  "bo": "\u1010\u102d\u1018\u1000\u103a",
+  "teo": "\u1010\u102e\u1006\u102d\u102f",
+  "te": "\u1010\u102e\u101c\u102e\u1002\u102f",
+  "ti": "\u1010\u102e\u1002\u103a\u101b\u1004\u103a\u101b\u102c",
+  "tk": "\u1010\u1001\u1039\u1019\u1004\u103a",
+  "se": "\u1010\u1031\u102c\u1004\u103a\u1006\u102c\u1019\u102d",
+  "nd": "\u1010\u1031\u102c\u1004\u103a\u1012\u102e\u1018\u102e\u101c\u102e",
+  "sma": "\u1010\u1031\u102c\u1004\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1006\u102c\u1019\u102d",
+  "dav": "\u1010\u102d\u102f\u1004\u103a\u1010\u102c",
+  "to": "\u1010\u103d\u1014\u103a\u1002\u102b",
+  "th": "\u1011\u102d\u102f\u1004\u103a\u1038",
+  "dak": "\u1012\u102b\u1000\u102d\u102f\u1010\u102c",
+  "del": "\u1012\u102e\u101c\u102c\u101d\u1032",
+  "dua": "\u1012\u1030\u1021\u101c\u102c",
+  "nl": "\u1012\u1010\u103a\u1001\u103b\u103a",
+  "da": "\u1012\u102d\u1014\u103a\u1038\u1019\u1010\u103a",
+  "dz": "\u1012\u103d\u1014\u103a\u1000\u102c",
+  "nqo": "\u1014\u1000\u102d\u102f",
+  "naq": "\u1014\u102c\u1019\u102c",
+  "ne": "\u1014\u102e\u1015\u102b\u101c\u102e",
+  "nus": "\u1014\u1030\u1021\u102c",
+  "no": "\u1014\u1031\u102c\u103a\u101d\u1031\u1038",
+  "nn": "\u1014\u1031\u102c\u103a\u101d\u1031\u1038 \u1014\u102e\u1038\u1014\u1031\u102c\u103a\u1005\u103a\u1001\u103a",
+  "fa": "\u1015\u102b\u101b\u103e\u1014\u103a",
+  "peo": "\u1015\u102b\u101b\u103e\u1014\u103a \u1021\u101f\u1031\u102c\u1004\u103a\u1038",
+  "ps": "\u1015\u102b\u101b\u103e\u103a\u1010\u102d\u102f",
+  "pi": "\u1015\u102b\u1020\u102d",
+  "pt": "\u1015\u1031\u102b\u103a\u1010\u1030\u1002\u102e",
+  "pl": "\u1015\u102d\u102f\u101c\u1014\u103a",
+  "pa": "\u1015\u1014\u103a\u1001\u103b\u102c\u1015\u102e",
+  "fr": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a",
+  "fro": "\u1015\u103c\u1004\u103a\u101e\u1005\u103a\u101f\u1031\u102c\u1004\u103a\u1038",
+  "nl_BE": "\u1016\u101c\u102e\u1019\u1005\u103a\u101b\u103e\u103a",
+  "fo": "\u1016\u102c\u101b\u102d\u102f\u1021\u102d\u1005\u103a",
+  "fil": "\u1016\u102d\u101c\u1005\u103a\u1015\u102e\u1014\u102d\u102f",
+  "fj": "\u1016\u102e\u1002\u103b\u102e",
+  "fi": "\u1016\u1004\u103a\u1014\u1005\u103a\u101b\u103e\u103a",
+  "my": "\u1017\u1019\u102c",
+  "vi": "\u1017\u102e\u101a\u1000\u103a\u1014\u1019\u103a",
+  "brx": "\u1017\u102d\u102f\u1012\u102d\u102f",
+  "vai": "\u1017\u102d\u102f\u1004\u103a",
+  "vun": "\u1017\u1014\u103a\u1002\u103b\u102d\u102f",
+  "en_GB": "\u1017\u103c\u102d\u1010\u102d\u101e\u103b\u103e \u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "pt_BR": "\u1018\u101b\u102c\u1007\u102e\u1038 \u1015\u1031\u102b\u103a\u1010\u1030\u1002\u102e",
+  "br": "\u1018\u101b\u102e\u1010\u103d\u1014\u103a",
+  "bas": "\u1018\u102c\u1006\u102c",
+  "ksf": "\u1018\u102c\u1016\u102e\u1021\u102c",
+  "ban": "\u1018\u102c\u101c\u102e",
+  "zxx": "\u1018\u102c\u101e\u102c\u1005\u1000\u102c\u1038 \u1014\u103e\u1004\u1037\u103a \u1015\u1010\u103a\u101e\u1000\u103a \u101e\u1031\u102c\u1021\u101b\u102c\u1019\u101b\u103e\u102d",
+  "bez": "\u1018\u102e\u1014\u102c",
+  "be": "\u1018\u102e\u101c\u102c\u101b\u102f",
+  "bg": "\u1018\u1030\u1002\u1031\u1038\u101b\u102e\u1038\u101a\u102c\u1038",
+  "bs": "\u1018\u1031\u102c\u1037\u1005\u103a\u1014\u102e\u1038\u101a\u102c\u1038",
+  "ba": "\u1018\u1000\u103a\u101b\u103e\u103a\u1000\u102e\u1021\u102c",
+  "bn": "\u1018\u1004\u103a\u1039\u1002\u102b\u101c\u102e",
+  "eu": "\u1018\u1005\u103a\u1000\u1039\u1000\u102e",
+  "bm": "\u1018\u1014\u103a\u1018\u102c\u101b\u102c",
+  "bem": "\u1018\u102d\u1014\u103a\u1018\u102c",
+  "nb": "\u1018\u103d\u1010\u103a\u1019\u1031\u102c\u103a\u101c\u103a",
+  "jmc": "\u1019\u1001\u103b\u102c\u1019\u102e",
+  "ms": "\u1019\u101c\u1031\u1038",
+  "ml": "\u1019\u101c\u1031\u1038\u101b\u102c\u101c\u1019\u103a",
+  "und": "\u1019\u101e\u102d \u101e\u102d\u102f\u1037\u1019\u101f\u102f\u1010\u103a \u1019\u101b\u103e\u102d \u101e\u1031\u102c \u1018\u102c\u101e\u102c\u1005\u1000\u102c\u1038",
+  "mgh": "\u1019\u102c\u1001\u1030\u101d\u102b-\u1019\u102e\u1021\u102e\u1010\u102d\u102f",
+  "kde": "\u1019\u102c\u1001\u103d\u1014\u103a\u1012\u102e",
+  "mk": "\u1019\u102c\u1005\u102e\u1012\u102d\u102f\u1014\u102e\u101a\u1036",
+  "mas": "\u1019\u102c\u1006\u102d\u102f\u1004\u103a",
+  "arn": "\u1019\u102c\u1015\u102f\u1001\u103b\u102e",
+  "mr": "\u1019\u102c\u101b\u101e\u102e",
+  "mgo": "\u1019\u102e\u1010\u102c",
+  "mer": "\u1019\u102e\u101b\u102f",
+  "root": "\u1019\u1030\u101c\u101b\u1004\u103a\u1038\u1019\u103c\u1005\u103a",
+  "zgh": "\u1019\u102d\u102f\u101b\u102d\u102f\u1000\u1014\u103a \u1010\u103d\u1019\u103a\u1019\u1007\u102d\u102f\u1010\u103a \u1005\u1036",
+  "mfe": "\u1019\u102d\u102f\u101b\u103e\u102e\u1005\u103a\u101a\u1014\u103a\u1038",
+  "moh": "\u1019\u102d\u102f\u101f\u1031\u102c\u1037\u1001\u103a",
+  "mi": "\u1019\u1031\u102c\u1004\u103a\u1038\u101b\u102e (\u1014\u101a\u1030\u1038\u1007\u102e\u101c\u1014\u103a\u1000\u103b\u103d\u1014\u103a\u1038\u101b\u103e\u102d \u1015\u1004\u103a\u101b\u1004\u103a\u1038\u1010\u102d\u102f\u1004\u103a\u1038\u101b\u1004\u103a\u1038\u101e\u102c\u1038\u101c\u1030\u1019\u103b\u102d\u102f\u1038)",
+  "mnc": "\u1019\u1014\u103a\u1001\u103b\u1030\u1038",
+  "mua": "\u1019\u1014\u103a\u1012\u1014\u103a\u1038",
+  "gv": "\u1019\u1014\u103a\u1038\u1007\u103a",
+  "mt": "\u1019\u1031\u102c\u101c\u1039\u1010\u102e\u1005\u103a",
+  "frr": "\u1019\u103c\u1031\u102c\u1000\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1016\u101b\u102e\u1005\u102e\u101b\u1014\u103a",
+  "mn": "\u1019\u103d\u1014\u103a\u1002\u102d\u102f\u101c\u102e\u1038\u101a\u1014\u103a\u1038",
+  "uk": "\u101a\u1030\u1000\u101b\u102d\u1014\u103a\u1038",
+  "nyn": "\u101a\u1014\u103a\u1000\u102d\u102f\u101c\u102e",
+  "ru": "\u101b\u102f\u101b\u103e",
+  "rm": "\u101b\u1031\u102c\u1019",
+  "ro": "\u101b\u102d\u102f\u1019\u1031\u1014\u102e\u101a\u102c\u1038",
+  "yo": "\u101b\u102d\u102f\u101b\u102f\u1018\u102c",
+  "zh_Hans": "\u101b\u102d\u102f\u1038\u101b\u103e\u1004\u103a\u1038\u101e\u1031\u102c \u1010\u101b\u102f\u1010\u103a",
+  "rn": "\u101b\u103d\u1014\u103a\u1012\u102e",
+  "rof": "\u101b\u103d\u1019\u103a\u1018\u102d\u102f",
+  "sn": "\u101b\u103e\u102d\u1014\u102c",
+  "zh_Hant": "\u101b\u103e\u1031\u1038\u101b\u102d\u102f\u1038\u1005\u1009\u103a\u101c\u102c \u1010\u101b\u102f\u1010\u103a",
+  "grc": "\u101b\u103e\u1031\u1038\u101f\u1031\u102c\u1004\u103a\u1038 \u1002\u101b\u102d",
+  "egy": "\u101b\u103e\u1031\u1038\u101f\u1031\u102c\u1004\u103a\u1038 \u1021\u102e\u1002\u103b\u1005\u103a",
+  "ksb": "\u101b\u103e\u1014\u103a\u1018\u102c\u101c\u102c",
+  "shn": "\u101b\u103e\u1019\u103a\u1038",
+  "lkt": "\u101c\u102c\u1000\u102d\u102f\u1010\u102c",
+  "lo": "\u101c\u102c\u1021\u102d\u102f",
+  "lb": "\u101c\u1030\u1007\u1004\u103a\u1018\u1010\u103a\u1000\u103a",
+  "lu": "\u101c\u1030\u1018\u102c-\u1001\u102b\u1010\u1014\u103a\u1002\u102b",
+  "luy": "\u101c\u1030\u101b\u102e\u1021\u102c",
+  "smj": "\u101c\u1030\u101c\u102e \u1006\u102c\u1019\u102d",
+  "luo": "\u101c\u1030\u1021\u102d\u102f",
+  "la": "\u101c\u1000\u103a\u1010\u1004\u103a",
+  "es_419": "\u101c\u1000\u103a\u1010\u1004\u103a\u1021\u1019\u1031\u101b\u102d\u1000 \u1005\u1015\u102d\u1014\u103a",
+  "lv": "\u101c\u1000\u1039\u1018\u102e\u1021\u1036",
+  "ln": "\u101c\u1004\u103a\u1002\u102b\u101c\u102c",
+  "lt": "\u101c\u1005\u1039\u101e\u1030\u1021\u102c\u1014\u102e\u101a\u1036",
+  "lag": "\u101c\u1014\u103a\u1002\u102e",
+  "rwk": "\u101d\u102b",
+  "nmg": "\u101d\u102b\u1006\u102e\u1021\u102d\u102f",
+  "ee": "\u101d\u102e",
+  "ug": "\u101d\u102e\u1002\u102b",
+  "wo": "\u101d\u1030\u101c\u102d\u102f\u1016\u103a",
+  "cy": "\u101d\u1031\u101c",
+  "sa": "\u101e\u1004\u103a\u1039\u101e\u1000\u101b\u102d\u102f\u1000\u103a",
+  "haw": "\u101f\u102c\u101d\u1031\u101a\u1036",
+  "ht": "\u101f\u102c\u1021\u102e\u1010\u102e\u1021\u1014\u103a",
+  "ha": "\u101f\u102c\u1025\u1005\u102c",
+  "he": "\u101f\u102e\u1038\u1018\u101b\u1030\u1038",
+  "hu": "\u101f\u1014\u103a\u1002\u1031\u101b\u102e",
+  "hi": "\u101f\u102d\u1014\u1039\u1012\u102e",
+  "mul": "\u1021\u1000\u103c\u102d\u1019\u103a\u1019\u103b\u102c\u1038\u1005\u103d\u102c \u1018\u102c\u101e\u102c\u1005\u1000\u102c\u1038\u1019\u103b\u102c\u1038",
+  "fy": "\u1021\u1014\u1031\u102c\u1000\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1016\u101b\u102e\u1005\u102e\u101b\u1014\u103a",
+  "nds": "\u1021\u1014\u102d\u1019\u1037\u103a \u1002\u103b\u102c\u1019\u1014\u103a",
+  "hsb": "\u1021\u1015\u1031\u102b\u103a\u1006\u102d\u102f\u1018\u102e\u1021\u1019\u103a",
+  "en_US": "\u1021\u1019\u1031\u101b\u102d\u1000\u1014\u103a \u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "ar_001": "\u1021\u101b\u1031\u1017\u102e(\u1015\u102f\u1036\u1019\u103e\u1014\u103a)",
+  "frs": "\u1021\u101b\u103e\u1031\u1037\u1015\u102d\u102f\u1004\u103a\u1038 \u1016\u101b\u102e\u1005\u102e\u101b\u1014\u103a",
+  "dum": "\u1021\u101c\u101a\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1012\u1010\u103a\u1001\u103b\u103a",
+  "enm": "\u1021\u101c\u101a\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "mga": "\u1021\u101c\u101a\u103a\u1015\u102d\u102f\u1004\u103a\u1038 \u1021\u102d\u102f\u1004\u103a\u1038\u101b\u1005\u103a",
+  "frm": "\u1021\u101c\u101a\u103a\u1015\u102d\u102f\u1004\u103a\u1038\u1015\u103c\u1004\u103a\u101e\u1005\u103a",
+  "gmh": "\u1021\u101c\u101a\u103a\u1015\u102d\u102f\u1004\u103a\u1038\u1021\u1019\u103c\u1004\u1037\u103a\u1002\u103b\u102c\u1019\u1014\u103a",
+  "tzm": "\u1021\u101c\u101a\u103a\u1021\u1000\u103a\u1010\u103a\u101c\u1000\u103a\u1005\u103a \u1010\u102c\u1019\u102c\u1007\u102d\u102f\u1000\u103a",
+  "ak": "\u1021\u102c\u1000\u102d\u1014\u103a",
+  "asa": "\u1021\u102c\u1005\u102f",
+  "af": "\u1021\u102c\u1016\u101b\u102d\u1000\u1014\u103a\u1038\u1005\u103a",
+  "hy": "\u1021\u102c\u1019\u1031\u1014\u102e\u1021\u1014\u103a",
+  "ar": "\u1021\u102c\u101b\u1031\u1017\u102e",
+  "mg": "\u1021\u102c\u101c\u102c\u1002\u102b\u1005\u102e",
+  "it": "\u1021\u102e\u1010\u101c\u102e",
+  "smn": "\u1021\u102e\u1014\u102c\u101b\u102e \u1006\u102c\u1019\u102d",
+  "iu": "\u1021\u102e\u1014\u102f\u1001\u103a\u1010\u102e\u1010\u102f",
+  "pt_PT": "\u1025\u101b\u1031\u102c\u1015 \u1015\u1031\u102b\u103a\u1010\u1030\u1002\u102e",
+  "uz": "\u1026\u1038\u1007\u103a\u1018\u1000\u103a",
+  "de_AT": "\u1029\u1005\u1010\u103c\u102e\u1038\u101a \u1002\u103b\u102c\u1019\u1014\u103a",
+  "en_AU": "\u1029\u1005\u1010\u103c\u1031\u1038\u101c\u103b\u103e \u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "az": "\u1021\u1031\u102c\u103a\u1007\u1031\u102c\u1018\u102d\u102f\u1004\u103a\u1002\u103b\u1031\u102c\u1014\u102e",
+  "ur": "\u1021\u1031\u102c\u103a\u1012\u1030",
+  "or": "\u1021\u102d\u102f\u101b\u102e\u101b\u102c",
+  "om": "\u1021\u102d\u102f\u101b\u102d\u102f\u1019\u102d\u102f",
+  "ab": "\u1021\u1000\u103a\u1001\u102b\u1007\u1030\u1021\u1014\u103b",
+  "eo": "\u1021\u1000\u1039\u1005\u1015\u101b\u1014\u1039\u1010\u102d\u102f",
+  "as": "\u1021\u1000\u1039\u1005\u1019\u102e\u1005\u103a",
+  "et": "\u1021\u1000\u103a\u1005\u103a\u1010\u102d\u102f\u1038\u1014\u102e\u1038\u101b\u1014\u103a\u1038",
+  "dsb": "\u1021\u1031\u102c\u1000\u103a\u1006\u102d\u102f\u1018\u102e\u1021\u1019\u103a",
+  "agq": "\u1021\u102c\u1002\u103a\u101f\u102d\u1014\u103a\u1038",
+  "en": "\u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a",
+  "ang": "\u1021\u1004\u103a\u1039\u1002\u101c\u102d\u1015\u103a\u1005\u102c\u101f\u1031\u102c\u1004\u103a\u1038",
+  "id": "\u1021\u1004\u103a\u1012\u102d\u102f\u1014\u102e\u1038\u101b\u103e\u102c\u1038",
+  "is": "\u1021\u102d\u102f\u1004\u103a\u1005\u103a\u101c\u1014\u1039\u1012\u102e",
+  "ga": "\u1021\u102d\u102f\u1004\u103a\u1038\u101b\u1005\u103a",
+  "sga": "\u1021\u102d\u102f\u1004\u103a\u1038\u101b\u1005\u103a \u101f\u1031\u102c\u1004\u103a\u1038",
+  "ig": "\u1021\u1005\u1039\u1002\u1018\u102d\u102f",
+  "am": "\u1021\u1014\u103a\u101f\u102c\u101b\u1005\u103b\u1001\u103b",
+  "ebu": "\u1021\u1019\u103a\u1018\u1030",
+  "sq": "\u1021\u101a\u103a\u101c\u103a\u1018\u1031\u1038\u1014\u102e\u1038\u101a\u1014\u103a\u1038",
+  "ace": "Achinese",
+  "ach": "Acoli",
+  "ada": "Adangme",
+  "ady": "Adyghe",
+  "aa": "Afar",
+  "afh": "Afrihili",
+  "ain": "Ainu",
+  "akk": "Akkadian",
+  "bss": "Akoose",
+  "akz": "Alabama",
+  "ale": "Aleut",
+  "arq": "Algerian Arabic",
+  "ase": "American Sign Language",
+  "anp": "Angika",
+  "njo": "Ao Naga",
+  "an": "Aragonese",
+  "arc": "Aramaic",
+  "aro": "Araona",
+  "arp": "Arapaho",
+  "arw": "Arawak",
+  "rup": "Aromanian",
+  "frp": "Arpitan",
+  "ast": "Asturian",
+  "cch": "Atsam",
+  "av": "Avaric",
+  "ae": "Avestan",
+  "awa": "Awadhi",
+  "ay": "Aymara",
+  "bfq": "Badaga",
+  "bfd": "Bafut",
+  "bqi": "Bakhtiari",
+  "bal": "Baluchi",
+  "bax": "Bamun",
+  "bjn": "Banjar",
+  "bbc": "Batak Toba",
+  "bar": "Bavarian",
+  "bej": "Beja",
+  "bew": "Betawi",
+  "bho": "Bhojpuri",
+  "bik": "Bikol",
+  "bin": "Bini",
+  "bpy": "Bishnupriya",
+  "bi": "Bislama",
+  "byn": "Blin",
+  "zbl": "Blissymbols",
+  "brh": "Brahui",
+  "bra": "Braj",
+  "bug": "Buginese",
+  "bum": "Bulu",
+  "bua": "Buriat",
+  "cad": "Caddo",
+  "frc": "Cajun French",
+  "yue": "Cantonese",
+  "cps": "Capiznon",
+  "car": "Carib",
+  "cay": "Cayuga",
+  "ceb": "Cebuano",
+  "dtp": "Central Dusun",
+  "esu": "Central Yupik",
+  "shu": "Chadian Arabic",
+  "chg": "Chagatai",
+  "ch": "Chamorro",
+  "chy": "Cheyenne",
+  "chb": "Chibcha",
+  "qug": "Chimborazo Highland Quichua",
+  "chn": "Chinook Jargon",
+  "chp": "Chipewyan",
+  "cho": "Choctaw",
+  "cu": "Church Slavic",
+  "chk": "Chuukese",
+  "cv": "Chuvash",
+  "nwc": "Classical Newari",
+  "syc": "Classical Syriac",
+  "ksh": "Colognian",
+  "swb": "Comorian",
+  "cop": "Coptic",
+  "mus": "Creek",
+  "crh": "Crimean Turkish",
+  "dar": "Dargwa",
+  "dzg": "Dazaga",
+  "din": "Dinka",
+  "dv": "Divehi",
+  "doi": "Dogri",
+  "dgr": "Dogrib",
+  "dyu": "Dyula",
+  "efi": "Efik",
+  "arz": "Egyptian Arabic",
+  "eka": "Ekajuk",
+  "elx": "Elamite",
+  "egl": "Emilian",
+  "myv": "Erzya",
+  "ewo": "Ewondo",
+  "ext": "Extremaduran",
+  "fan": "Fang",
+  "fat": "Fanti",
+  "hif": "Fiji Hindi",
+  "fon": "Fon",
+  "gur": "Frafra",
+  "fur": "Friulian",
+  "ff": "Fulah",
+  "gaa": "Ga",
+  "gan": "Gan Chinese",
+  "gay": "Gayo",
+  "gba": "Gbaya",
+  "gez": "Geez",
+  "aln": "Gheg Albanian",
+  "bbj": "Ghomala",
+  "glk": "Gilaki",
+  "gil": "Gilbertese",
+  "gom": "Goan Konkani",
+  "gon": "Gondi",
+  "gor": "Gorontalo",
+  "got": "Gothic",
+  "grb": "Grebo",
+  "gwi": "Gwich\u02bcin",
+  "hai": "Haida",
+  "hak": "Hakka Chinese",
+  "hz": "Herero",
+  "hil": "Hiligaynon",
+  "ho": "Hiri Motu",
+  "hit": "Hittite",
+  "hmn": "Hmong",
+  "hup": "Hupa",
+  "iba": "Iban",
+  "ibb": "Ibibio",
+  "io": "Ido",
+  "ilo": "Iloko",
+  "izh": "Ingrian",
+  "inh": "Ingush",
+  "ia": "Interlingua",
+  "ie": "Interlingue",
+  "ik": "Inupiaq",
+  "jam": "Jamaican Creole English",
+  "kaj": "Jju",
+  "jut": "Jutish",
+  "kbd": "Kabardian",
+  "kgp": "Kaingang",
+  "kkj": "Kako",
+  "xal": "Kalmyk",
+  "kbl": "Kanembu",
+  "kr": "Kanuri",
+  "kaa": "Kara-Kalpak",
+  "krc": "Karachay-Balkar",
+  "krl": "Karelian",
+  "csb": "Kashubian",
+  "kaw": "Kawi",
+  "ken": "Kenyang",
+  "kho": "Khotanese",
+  "khw": "Khowar",
+  "kmb": "Kimbundu",
+  "krj": "Kinaray-a",
+  "kiu": "Kirmanjki",
+  "tlh": "Klingon",
+  "bkm": "Kom",
+  "kv": "Komi",
+  "kfo": "Koro",
+  "kos": "Kosraean",
+  "avk": "Kotava",
+  "kpe": "Kpelle",
+  "kri": "Krio",
+  "kj": "Kuanyama",
+  "kum": "Kumyk",
+  "kru": "Kurukh",
+  "kut": "Kutenai",
+  "lad": "Ladino",
+  "lah": "Lahnda",
+  "lam": "Lamba",
+  "ltg": "Latgalian",
+  "lzz": "Laz",
+  "lez": "Lezghian",
+  "lij": "Ligurian",
+  "li": "Limburgish",
+  "lfn": "Lingua Franca Nova",
+  "lzh": "Literary Chinese",
+  "liv": "Livonian",
+  "jbo": "Lojban",
+  "lmo": "Lombard",
+  "sli": "Lower Silesian",
+  "loz": "Lozi",
+  "lua": "Luba-Lulua",
+  "lui": "Luiseno",
+  "lun": "Lunda",
+  "mde": "Maba",
+  "mad": "Madurese",
+  "maf": "Mafa",
+  "mag": "Magahi",
+  "vmf": "Main-Franconian",
+  "mai": "Maithili",
+  "mak": "Makasar",
+  "mdr": "Mandar",
+  "man": "Mandingo",
+  "mni": "Manipuri",
+  "chm": "Mari",
+  "mh": "Marshallese",
+  "mwr": "Marwari",
+  "mzn": "Mazanderani",
+  "byv": "Medumba",
+  "men": "Mende",
+  "mwv": "Mentawai",
+  "es_MX": "Mexican Spanish",
+  "mic": "Micmac",
+  "nan": "Min Nan Chinese",
+  "min": "Minangkabau",
+  "xmf": "Mingrelian",
+  "mwl": "Mirandese",
+  "lus": "Mizo",
+  "mdf": "Moksha",
+  "ro_MD": "Moldavian",
+  "lol": "Mongo",
+  "ary": "Moroccan Arabic",
+  "mos": "Mossi",
+  "ttt": "Muslim Tat",
+  "mye": "Myene",
+  "na": "Nauru",
+  "nv": "Navajo",
+  "ng": "Ndonga",
+  "nap": "Neapolitan",
+  "new": "Newari",
+  "sba": "Ngambay",
+  "nnh": "Ngiemboon",
+  "yrl": "Nheengatu",
+  "nia": "Nias",
+  "niu": "Niuean",
+  "nog": "Nogai",
+  "nso": "Northern Sotho",
+  "nov": "Novial",
+  "nym": "Nyamwezi",
+  "ny": "Nyanja",
+  "tog": "Nyasa Tonga",
+  "nyo": "Nyoro",
+  "nzi": "Nzima",
+  "oc": "Occitan",
+  "oj": "Ojibwa",
+  "goh": "Old High German",
+  "non": "Old Norse",
+  "pro": "Old Proven\u00e7al",
+  "osa": "Osage",
+  "os": "Ossetic",
+  "ota": "Ottoman Turkish",
+  "pal": "Pahlavi",
+  "pfl": "Palatine German",
+  "pau": "Palauan",
+  "pam": "Pampanga",
+  "pag": "Pangasinan",
+  "pap": "Papiamento",
+  "pdc": "Pennsylvania German",
+  "phn": "Phoenician",
+  "pcd": "Picard",
+  "pms": "Piedmontese",
+  "pdt": "Plautdietsch",
+  "pon": "Pohnpeian",
+  "pnt": "Pontic",
+  "prg": "Prussian",
+  "raj": "Rajasthani",
+  "rap": "Rapanui",
+  "rar": "Rarotongan",
+  "rif": "Riffian",
+  "rgn": "Romagnol",
+  "rom": "Romany",
+  "rtm": "Rotuman",
+  "rug": "Roviana",
+  "rue": "Rusyn",
+  "ssy": "Saho",
+  "sah": "Sakha",
+  "sam": "Samaritan Aramaic",
+  "sm": "Samoan",
+  "sgs": "Samogitian",
+  "sad": "Sandawe",
+  "sat": "Santali",
+  "sc": "Sardinian",
+  "sas": "Sasak",
+  "sdc": "Sassarese Sardinian",
+  "stq": "Saterland Frisian",
+  "saz": "Saurashtra",
+  "gd": "Scottish Gaelic",
+  "sly": "Selayar",
+  "sel": "Selkup",
+  "see": "Seneca",
+  "sh": "Serbo-Croatian",
+  "srr": "Serer",
+  "sei": "Seri",
+  "scn": "Sicilian",
+  "sid": "Sidamo",
+  "bla": "Siksika",
+  "szl": "Silesian",
+  "den": "Slave",
+  "sog": "Sogdien",
+  "snk": "Soninke",
+  "azb": "South Azerbaijani",
+  "nr": "South Ndebele",
+  "alt": "Southern Altai",
+  "st": "Southern Sotho",
+  "srn": "Sranan Tongo",
+  "suk": "Sukuma",
+  "sux": "Sumerian",
+  "sus": "Susu",
+  "ss": "Swati",
+  "syr": "Syriac",
+  "tl": "Tagalog",
+  "ty": "Tahitian",
+  "tly": "Talysh",
+  "tmh": "Tamashek",
+  "trv": "Taroko",
+  "ter": "Tereno",
+  "tet": "Tetum",
+  "tig": "Tigre",
+  "tem": "Timne",
+  "tiv": "Tiv",
+  "tli": "Tlingit",
+  "tpi": "Tok Pisin",
+  "tkl": "Tokelau",
+  "fit": "Tornedalen Finnish",
+  "tkr": "Tsakhur",
+  "tsd": "Tsakonian",
+  "tsi": "Tsimshian",
+  "ts": "Tsonga",
+  "tn": "Tswana",
+  "tcy": "Tulu",
+  "tum": "Tumbuka",
+  "aeb": "Tunisian Arabic",
+  "tru": "Turoyo",
+  "tvl": "Tuvalu",
+  "tyv": "Tuvinian",
+  "tw": "Twi",
+  "kcg": "Tyap",
+  "udm": "Udmurt",
+  "uga": "Ugaritic",
+  "umb": "Umbundu",
+  "ve": "Venda",
+  "vec": "Venetian",
+  "vep": "Veps",
+  "vo": "Volap\u00fck",
+  "vro": "V\u00f5ro",
+  "vot": "Votic",
+  "wa": "Walloon",
+  "wae": "Walser",
+  "war": "Waray",
+  "wbp": "Warlpiri",
+  "was": "Washo",
+  "guc": "Wayuu",
+  "vls": "West Flemish",
+  "mrj": "Western Mari",
+  "wal": "Wolaytta",
+  "wuu": "Wu Chinese",
+  "hsn": "Xiang Chinese",
+  "yav": "Yangben",
+  "yao": "Yao",
+  "yap": "Yapese",
+  "ybb": "Yemba",
+  "yi": "Yiddish",
+  "zap": "Zapotec",
+  "zza": "Zaza",
+  "zea": "Zeelandic",
+  "zen": "Zenaga",
+  "za": "Zhuang",
+  "gbz": "Zoroastrian Dari",
+  "zun": "Zuni"
+}
diff --git a/public/intl/messages/am-ET.json b/public/intl/messages/am-ET.json
index b82cdf365e..f48fe83c4d 100644
--- a/public/intl/messages/am-ET.json
+++ b/public/intl/messages/am-ET.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Back"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirm password"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Countries"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Date range"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Delete website"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Dismiss"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Events"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Logout"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "More"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operating systems"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Page views"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Realtime"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Single day"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Tracking code"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Unknown"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
index b850db9b70..a9a12404eb 100644
--- a/public/intl/messages/ar-SA.json
+++ b/public/intl/messages/ar-SA.json
@@ -41,6 +41,12 @@
       "value": "مدير"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "تحليلات"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "للخلف"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "معدل الارتداد"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "المدن"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "تأكيد كلمة المرور"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "الدول"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "البيانات"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "فترة مخصصة"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "حذف الموقع"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "تفاصيل"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "اخفاء"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "الأحداث"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "مفصلة"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "مغادرة المجموعة"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "تسجيل الخروج"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "الأعضاء"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "المزيد"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "غير معرف"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "نظام التشغيل"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "المالك"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "مشاهدات الصفحة"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "الوقت الفعلي"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "اعادة انشاء"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "اعادة تعيين الإحصائيات"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "يوم واحد"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "عضو المجموعة"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "مدير المجموعة"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "تغيير الإحصائيات"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "كود التتبع"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "غير معروف"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "المستخدمين"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "الأمس"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
index 9d17b70054..4978aa45c7 100644
--- a/public/intl/messages/be-BY.json
+++ b/public/intl/messages/be-BY.json
@@ -41,6 +41,12 @@
       "value": "Адміністратар"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Назад"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Паказчык адмоваў"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Падцвердзіць пароль"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Краіны"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Дыяпазон дат"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Выдаліць сайт"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Адмена"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Падзеі"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Сырыя"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Выйсці"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Болей"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Няма"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Аперацыонныя сістэмы"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Уласнік"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Прагляды старонкі"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "У рэяльным часе"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Скінуць статыстыку"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Адзін дзень"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Пераключыць графікі"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Код адсочвання"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Невядома"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Учора"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/bn-BD.json b/public/intl/messages/bn-BD.json
index 6e51b096ee..938f6f98ff 100644
--- a/public/intl/messages/bn-BD.json
+++ b/public/intl/messages/bn-BD.json
@@ -41,6 +41,12 @@
       "value": "অ্যাডমিন"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "পেছনে"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "বহিষ্কারের হার"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "পাসওয়ার্ড নিশ্চিত করুন"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "দেশ"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "তারিখের পরিসীমা"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "ওয়েবসাইট মুছুন"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "বাতিল"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "ঘটনা"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "অপরিশোধিত"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "লগ আউট"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "আরও"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "কিছুই না"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "অপারেটিং সিস্টেম গুলো"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "মালিক"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "পৃষ্ঠা পরিদর্শন গুলো"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "সরাসরি"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "ওয়েবসাইট রিসেট করুন"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "একদিন"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "চার্ট পরিবর্তন করুন"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "ট্র্যাকিং কোড"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "অজানা"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ca-ES.json b/public/intl/messages/ca-ES.json
index 6a3f0542a2..694b49c22e 100644
--- a/public/intl/messages/ca-ES.json
+++ b/public/intl/messages/ca-ES.json
@@ -41,6 +41,12 @@
       "value": "Administrador"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Enrere"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Percentatge de rebot"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirma la contrasenya"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Països"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Interval de dates"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Esborra el lloc web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Descarta"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Esdeveniments"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "En cru"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Desconnecta't"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Més"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemes operatius"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Propietari"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Pàgines vistes"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Temps real"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Restableix estadístiques"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Un sol dia"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Mostra/amaga gràfics"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Codi de seguiment"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Desconegut"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Ahir"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/cs-CZ.json b/public/intl/messages/cs-CZ.json
index abfc225db3..3fd34c31d5 100644
--- a/public/intl/messages/cs-CZ.json
+++ b/public/intl/messages/cs-CZ.json
@@ -41,6 +41,12 @@
       "value": "Administrátor"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Zpět"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Okamžité opuštění"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Potvrdit heslo"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Země"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Období"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Smazat web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Odejít"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Události"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Nezpracované"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Odhlásit"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Více"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operační systém"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Zobrazení stránek"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Aktuálně"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Jeden den"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Sledovací kód"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Neznámý"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/da-DK.json b/public/intl/messages/da-DK.json
index e69d70363b..d8da1c3eb5 100644
--- a/public/intl/messages/da-DK.json
+++ b/public/intl/messages/da-DK.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Tilbage"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Afvisningsprocent"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Godkendt adgangskode"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Lande"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datointerval"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Slet hjemmeside"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Afvis"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Hændelser"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Rå"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Log ud"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Mere"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operativsystemer"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Ejer"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Sidevisninger"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Realtid"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Nulstil statistikker"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Enkelt dag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Ændre graf"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Sporingskode"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Ukendt"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/de-CH.json b/public/intl/messages/de-CH.json
index 4a5fd0a221..aa0b2d942a 100644
--- a/public/intl/messages/de-CH.json
+++ b/public/intl/messages/de-CH.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Zrugg"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Absprungsrate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Städt"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Passwort widerhole"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Länder"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Datä"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datumsbereich"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Websiite lösche"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Verwerfe"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Ereigniss"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Rohdate"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Team verlah"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Abmelde"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Mitglieder"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Meh"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Keis"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Betriibssystem"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Bsitzer"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Siitenufrüef"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Echtzit"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Erneuere"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Statistik zruggsetze"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Ein Tag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team Mitglied"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team Bsitzer"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Schaubilder umschalte"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Tracking Code"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Unbekannt"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Benutzer"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Gester"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/de-DE.json b/public/intl/messages/de-DE.json
index ef34acd278..136cd31dd4 100644
--- a/public/intl/messages/de-DE.json
+++ b/public/intl/messages/de-DE.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Durchschnitt"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Zurück"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Absprungrate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Städte"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Passwort wiederholen"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Länder"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Report erstellen"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Daten"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datumsbereich"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Webseite löschen"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Beschreibung"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Verwerfen"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Ereignisse"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Rohdaten"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Größer als"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Größer oder gleich"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Team verlassen"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Kleiner als"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Kleiner oder gleich"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Abmelden"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Mitglieder"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Mehr"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Keine"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Betriebssysteme"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Übersicht"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Besitzer"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Seitenaufrufe"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Echtzeit"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Erneuern"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Statistik zurücksetzen"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Ein Tag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Summe"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team Mitglied"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team Eigentümer"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Schaubilder umschalten"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Tracking Code"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Unbekannt"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Benutzer"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Gestern"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Durchschnitt"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Report erstellen"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Beschreibung"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Größer als"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Größer oder gleich"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Kleiner als"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Kleiner oder gleich"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Übersicht"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Summe"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/el-GR.json b/public/intl/messages/el-GR.json
index 26fdc53552..d3ff5e4246 100644
--- a/public/intl/messages/el-GR.json
+++ b/public/intl/messages/el-GR.json
@@ -41,6 +41,12 @@
       "value": "Διαχειριστής"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Πίσω"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Ποσοστό αναπήδησης"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Επιβεβαίωση κωδικού"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Χώρες"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Εύρος ημερομηνιών"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Διαγραφή ιστότοπου"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Dismiss"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Γεγονότα"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Ακατέργαστο"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Αποσύνδεση"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Περισσότερα"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Λειτουργικά συστήματα"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Προβολές σελίδας"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Realtime"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Ημερήσια"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Κωδικός παρακολούθησης"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Άγνωστο"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/en-GB.json b/public/intl/messages/en-GB.json
index 4194da83cc..0e6ac61495 100644
--- a/public/intl/messages/en-GB.json
+++ b/public/intl/messages/en-GB.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Back"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirm password"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Countries"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Date range"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Delete website"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Dismiss"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Events"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Logout"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "More"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operating systems"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Page views"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Realtime"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Single day"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Tracking code"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Unknown"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/en-US.json b/public/intl/messages/en-US.json
index 929f61c996..64a99ae1b8 100644
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Back"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirm password"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Countries"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Date range"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Delete website"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Dismiss"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Events"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Logout"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "More"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operating systems"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Page views"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Realtime"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset website"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Single day"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Tracking code"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Unknown"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
@@ -1176,7 +1284,7 @@
   "message.no-results-found": [
     {
       "type": 0,
-      "value": "No results were found."
+      "value": "No results found."
     }
   ],
   "message.no-team-websites": [
diff --git a/public/intl/messages/es-ES.json b/public/intl/messages/es-ES.json
index 6d52896573..43e1017091 100644
--- a/public/intl/messages/es-ES.json
+++ b/public/intl/messages/es-ES.json
@@ -41,6 +41,12 @@
       "value": "Administrador"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Después"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analíticas"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Media"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Atrás"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Antes"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Porcentaje de rebote"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Desglose"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Ciudades"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmar contraseña"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contiene"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Países"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Crear reporte"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Datos"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Intervalo de fechas"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Eliminar sitio"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Descripciones"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Detalles"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Ignorar"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "No contiene"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Eventos"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "En crudo"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filtros"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Mayor que"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Mayor que o igual a"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Es igual a"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "No es igual a"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Abandonar equipo"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Menor que"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Menor que o igual a"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Cerrar sesión"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Máx"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Miembros"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Mín"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Más"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Ninguno"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
+    {
+      "type": 0,
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
     {
       "type": 0,
-      "value": "Sistemas operativos"
+      "value": "Resumen"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Propietario"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Vistas"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Tiempo real"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerar"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reiniciar estadísticas"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Un solo día"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Suma"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Miembro del equipo"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Admin. del equipo"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Alternar gráficas"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total de registros"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Código de rastreo"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "Verdadero"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Tipo"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Único"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Desconocida"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Sin título"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Usuarios"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Valor"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Ayer"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "Después"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Media"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Antes"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Desglose"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contiene"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Crear reporte"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Descripciones"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "No contiene"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "No es igual a"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Es igual a"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filtros"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Mayor que"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Mayor que o igual a"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Menor que"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Menor que o igual a"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Máx"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Mín"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Resumen"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Suma"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total de registros"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "Verdadero"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Tipo"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Único"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Sin título"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Valor"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/es-MX.json b/public/intl/messages/es-MX.json
index 6e2cf72b76..c238951fe2 100644
--- a/public/intl/messages/es-MX.json
+++ b/public/intl/messages/es-MX.json
@@ -41,6 +41,12 @@
       "value": "Administrador"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analíticas"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Atrás"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Porcentaje de rebote"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Ciudades"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmar contraseña"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Países"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Datos"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Intervalo de fechas"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Eliminar sitio"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Detalles"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Ignorar"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Eventos"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Personalizado"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Abandonar equipo"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Cerrar sesión"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Miembros"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Más"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Ninguno"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemas operativos"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Propietario"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Vistas"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Tiempo real"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerar"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reiniciar estadísticas"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Día"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Miembro de equipo"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Admin. del equipo"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Alternar gráficas"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Código de rastreo"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Desconocida"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Usuarios"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Ayer"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/fa-IR.json b/public/intl/messages/fa-IR.json
index 8f2d9378e1..757b5ae8ea 100644
--- a/public/intl/messages/fa-IR.json
+++ b/public/intl/messages/fa-IR.json
@@ -41,6 +41,12 @@
       "value": "مدیر"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "برگشت"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "نرخ Bounce"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "تایید رمز"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "کشورها"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "محدوده‌ی تاریخ"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "حذف وب‌سایت"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "رد کردن"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "رویدادها"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "خام"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "خروج"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "بیشتر"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "سیستم‌عامل‌ها"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "ایجاد شده توسط"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "بازدید صفحه"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "آمار زنده"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "بازنشانی آمار"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "یک روز"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "کد رهگیری"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "ناشناخته"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/fi-FI.json b/public/intl/messages/fi-FI.json
index b78025f332..5fdf5b193e 100644
--- a/public/intl/messages/fi-FI.json
+++ b/public/intl/messages/fi-FI.json
@@ -41,6 +41,12 @@
       "value": "Järjestelmänvalvoja"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Takaisin"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Välitön poistuminen"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Vahvista salasana"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Maat"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Ajanjakso"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Poista verkkosivu"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Hylkää"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Tapahtumat"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Käsittelemätön"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Kirjaudu ulos"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Lisää"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Käyttöjärjestelmät"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Omistaja"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Sivun näyttökerrat"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Juuri nyt"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Nollaa tilastot"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Yksi päivä"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Kytke kaaviot päälle/pois"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Seurantakoodi"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Tuntematon"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/fo-FO.json b/public/intl/messages/fo-FO.json
index 8b98376ec2..3eb3f452c7 100644
--- a/public/intl/messages/fo-FO.json
+++ b/public/intl/messages/fo-FO.json
@@ -41,6 +41,12 @@
       "value": "Fyrisitari"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Aftur"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce prosenttal"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Vátta loyniorð"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Lond"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Vel dato"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Sletta heimasíðu"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Lat fara"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Hendingar/tiltøk"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Óviðgjørt"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Rita út"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Meira"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Stýrikervir"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Opnaðar síðir"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Beinleiðis"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Einkultur dagur"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Spori kota"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Ókent"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/fr-FR.json b/public/intl/messages/fr-FR.json
index 992f4c703c..326c99a463 100644
--- a/public/intl/messages/fr-FR.json
+++ b/public/intl/messages/fr-FR.json
@@ -41,6 +41,12 @@
       "value": "Administrateur"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Après"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Moyenne"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Retour"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Avant"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Taux de rebond"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Répartition"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Villes"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmation du mot de passe"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contient"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Pays"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Créer un rapport"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Données"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Période"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Supprimer le site"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Détails"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Ignorer"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Ne contient pas"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Événements"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "Faux"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Brut"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filtres"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Entonnoir"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Supérieur à"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Supérieur ou égal à"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Est égal"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "N'est pas égal"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +511,18 @@
       "value": "Quitter l'équipe"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Inférieur à"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Inférieur ou égal à"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +535,24 @@
       "value": "Déconnexion"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Membres"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +565,12 @@
       "value": "Plus"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +589,16 @@
       "value": "Aucun·e"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
+    {
+      "type": 0,
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
     {
       "type": 0,
-      "value": "Systèmes d'exploitation"
+      "value": "Vue d'ensemble"
     }
   ],
   "label.owner": [
@@ -439,12 +607,36 @@
       "value": "Propriétaire"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Pages vues"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +689,12 @@
       "value": "Temps réel"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +713,12 @@
       "value": "Régénérer"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +755,12 @@
       "value": "Réinitialiser les statistiques"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -611,6 +821,12 @@
       "value": "Journée"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Somme"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +857,24 @@
       "value": "Membre de l'équipe"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Propriétaire de l'équipe"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +929,42 @@
       "value": "Afficher/Masquer les graphiques"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Nombre d'enregistrements"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Code de suivi"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "Vrai"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +977,12 @@
       "value": "Inconnu"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Sans titre"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1013,12 @@
       "value": "Utilisateurs"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Valeur"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1079,6 @@
       "value": "Hier"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "Après"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Moyenne"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Avant"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Répartition"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contient"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Créer un rapport"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Ne contient pas"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "N'est pas égal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Est égal"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "Faux"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filtres"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Supérieur à"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Supérieur ou égal à"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Inférieur à"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Inférieur ou égal à"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Vue d'ensemble"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Somme"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Nombre d'enregistrements"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "Vrai"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Sans titre"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Valeur"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ga-ES.json b/public/intl/messages/ga-ES.json
index 6101da4774..d086b57f87 100644
--- a/public/intl/messages/ga-ES.json
+++ b/public/intl/messages/ga-ES.json
@@ -41,6 +41,12 @@
       "value": "Administradora"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Atrás"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Proporción de rebote"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmar contrasinal"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Países"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Rango temporal"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Eliminar sitio web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Desbotar"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Eventos"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Pechar sesión"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Máis"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemas operativos"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Dona"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Vistas de páxinas"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Agora mesmo"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -567,6 +771,12 @@
       "value": " in the box below to confirm."
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -627,6 +837,12 @@
       "value": "Un só día"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -657,12 +873,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -717,12 +945,42 @@
       "value": "Activación das gráficas"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Código de seguimento"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -735,6 +993,12 @@
       "value": "Descoñecido"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -765,6 +1029,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -825,168 +1095,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/he-IL.json b/public/intl/messages/he-IL.json
index 7a5c063c78..dc206268c2 100644
--- a/public/intl/messages/he-IL.json
+++ b/public/intl/messages/he-IL.json
@@ -41,6 +41,12 @@
       "value": "מנהל"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "חזרה"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "אישור סיסמה"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "מדינות"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "טווח תאריכים"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "הסרת אתר"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "שיחרור"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "אירועים"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "גולמי"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +511,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +535,24 @@
       "value": "התנתקות"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +565,12 @@
       "value": "עוד"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +589,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "מערכות הפעלה"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +607,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "צפיות בדפים"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +689,12 @@
       "value": "זמן אמת"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +713,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +755,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -611,6 +821,12 @@
       "value": "יום בודד"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +857,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +929,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "קוד מעקב"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +977,12 @@
       "value": "לא ידוע"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1013,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1079,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/hi-IN.json b/public/intl/messages/hi-IN.json
index 0439438544..91f1f02676 100644
--- a/public/intl/messages/hi-IN.json
+++ b/public/intl/messages/hi-IN.json
@@ -41,6 +41,12 @@
       "value": "प्रशासक"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "पीछे"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "उछाल दर"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "पासवर्ड की पुष्टि कीजिये"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "देश"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "तिथि सीमा"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "वेबसाइट हटाएं"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "खारिज कीजिये"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "स्पर्धाएँ"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "रॉ"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "लॉग आउट"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "और"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "ऑपरेटिंग सिस्टम"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "पृष्ठ दृश्य"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "वास्तव काल"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "एक दिन"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "ट्रैकिंग कोड"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "अज्ञात"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/hr-HR.json b/public/intl/messages/hr-HR.json
index bfac159a79..cd8d4d38b0 100644
--- a/public/intl/messages/hr-HR.json
+++ b/public/intl/messages/hr-HR.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Natrag "
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Potvrdi lozinku"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Countries"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Raspon datuma"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Obriši web stranicu"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Odbaci"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Events"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Odjava"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Više"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Ništa"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operating systems"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Vlasnik"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Page views"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Stvarno vrijeme"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Resetirati web stranicu"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Jedan dan"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Kod za praćenje"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Nepoznato"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Jučer"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/hu-HU.json b/public/intl/messages/hu-HU.json
index 2d12b05b3b..e39182b181 100644
--- a/public/intl/messages/hu-HU.json
+++ b/public/intl/messages/hu-HU.json
@@ -41,6 +41,12 @@
       "value": "Adminisztrátor"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Vissza"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Visszafordulási arány"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Jelszó megerősítése"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Országok"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Időintervallum"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Weboldal eltávolítása"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Mellőzés"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Események"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Nyers"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Kijelentkezés"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Bővebben"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operációs rendszerek"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Oldalmegtekintések"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Valós idejű"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Egy nap"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Követési kód"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Ismeretlen"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/id-ID.json b/public/intl/messages/id-ID.json
index 9a8b5f4122..97526840b4 100644
--- a/public/intl/messages/id-ID.json
+++ b/public/intl/messages/id-ID.json
@@ -41,6 +41,12 @@
       "value": "Pengelola"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Kembali"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Rasio pentalan"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Konfirmasi kata sandi"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Negara"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Rentang tanggal"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Hapus situs web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Tutup"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Perihal"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Mentah"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +511,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +535,24 @@
       "value": "Keluar"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +565,12 @@
       "value": "Lebih banyak"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +589,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistem Operasi"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +607,36 @@
       "value": "Pemilik"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Tampilan halaman"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +689,12 @@
       "value": "Waktu nyata"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +713,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +755,12 @@
       "value": "Atur ulang statistik"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -611,6 +821,12 @@
       "value": "Sehari"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +857,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +929,42 @@
       "value": "Buka grafik"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Kode lacak"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +977,12 @@
       "value": "Tidak diketahui"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1013,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1079,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/it-IT.json b/public/intl/messages/it-IT.json
index dcff2f880f..a93715d3dc 100644
--- a/public/intl/messages/it-IT.json
+++ b/public/intl/messages/it-IT.json
@@ -41,6 +41,12 @@
       "value": "Amministratore"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Indietro"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Frequenza di rimbalzo"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Conferma password"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Nazioni"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Periodo"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Elimina sito"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Scarta"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Eventi"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Esci"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Dettagli"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemi operativi"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Proprietario"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Visualizzazioni di pagina"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Tempo reale"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Resetta le statistiche"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Singolo giorno"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Apri/Chiudi i grafici"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Codice di tracking"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Sconosciuto"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Ieri"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ja-JP.json b/public/intl/messages/ja-JP.json
index 16b17513e7..bde2f3a93a 100644
--- a/public/intl/messages/ja-JP.json
+++ b/public/intl/messages/ja-JP.json
@@ -41,6 +41,12 @@
       "value": "管理者"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "戻る"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "直帰率"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "パスワード（確認）"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "国"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "範囲指定"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Webサイトの削除"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "無視する"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "イベント"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "すべて表示"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "ログアウト"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "さらに表示"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,24 +597,54 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
       "value": "OS"
     }
   ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
+    }
+  ],
   "label.owner": [
     {
       "type": 0,
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "閲覧数"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -509,6 +701,12 @@
       "value": "リアルタイム"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -527,6 +725,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -563,6 +767,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -623,6 +833,12 @@
       "value": "一日のみ"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -653,12 +869,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -713,12 +941,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "トラッキングコード"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -731,6 +989,12 @@
       "value": "不明"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -761,6 +1025,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -821,168 +1091,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/km-KH.json b/public/intl/messages/km-KH.json
index 938c3df8c8..1f7b82ca46 100644
--- a/public/intl/messages/km-KH.json
+++ b/public/intl/messages/km-KH.json
@@ -41,6 +41,12 @@
       "value": "អ្នកគ្រប់គ្រង"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "ថយក្រោយ"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "ចំនួនវិលត្រឡប់"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "បញ្ជាក់ពាក្យសម្ងាត់"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "ប្រទេស"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "ចន្លោះកាលបរិច្ឆេទ"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "លុបគេហទំព័រ"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "បដិសេធ"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "ព្រឹត្តិការណ៍"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "ដើម"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +511,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +535,24 @@
       "value": "ចេញ"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +565,12 @@
       "value": "បន្ថែម"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +589,16 @@
       "value": "មិនមាន"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "ប្រព័ន្ធប្រតិបត្តិការ"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +607,36 @@
       "value": "ម្ចាស់"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "អ្នកមើលទំព័រ"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +689,12 @@
       "value": "ឥលូវនេះ"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +713,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +755,12 @@
       "value": "កំណត់ស្ថិតិឡើងវិញ"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -611,6 +821,12 @@
       "value": "ថ្ងៃតែមួយ"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +857,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +929,42 @@
       "value": "បិទ/បើកតារាង"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "លេខកូដតាមដាន"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +977,12 @@
       "value": "មិនស្គាល់"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1013,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1079,6 @@
       "value": "ម្សិលមិញ"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 0,
diff --git a/public/intl/messages/ko-KR.json b/public/intl/messages/ko-KR.json
index 4c7b4f539d..26413708bd 100644
--- a/public/intl/messages/ko-KR.json
+++ b/public/intl/messages/ko-KR.json
@@ -41,6 +41,12 @@
       "value": "관리자"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "뒤로"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "이탈률"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "비밀번호 확인"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "국가"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "날짜 범위"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "웹사이트 삭제"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "무시하기"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "이벤트"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "전체 보기"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "로그아웃"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "더 보기"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "운영체제"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "페이지 뷰(PV)"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -509,6 +701,12 @@
       "value": "실시간"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -527,6 +725,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -563,6 +767,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -623,6 +833,12 @@
       "value": "하루"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -653,12 +869,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -713,12 +941,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "추적 코드"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -731,6 +989,12 @@
       "value": "알 수 없음"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -761,6 +1025,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -821,168 +1091,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/lt-LT.json b/public/intl/messages/lt-LT.json
index 46e3366695..21610b7bd2 100644
--- a/public/intl/messages/lt-LT.json
+++ b/public/intl/messages/lt-LT.json
@@ -41,6 +41,12 @@
       "value": "Administratorius"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Atgal"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Atmetimo rodiklis"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Patvirtinti slaptažodį"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Šalys"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Laikotarpis"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Ištrinti svetainę"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Gerai"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Įvykiai"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Neapdoroti"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -492,6 +624,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -504,12 +648,24 @@
       "value": "Atsijungti"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -522,6 +678,12 @@
       "value": "Daugiau"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -540,10 +702,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operacinės sistemos"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -552,12 +720,36 @@
       "value": "Savininkas"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Puslapių peržiūros"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -610,6 +802,12 @@
       "value": "Realiuoju laiku"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -628,6 +826,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -664,6 +868,12 @@
       "value": "Atstatyti statistikos duomenis"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -724,6 +934,12 @@
       "value": "Viena diena"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -754,12 +970,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -814,12 +1042,42 @@
       "value": "Rodyti / slėpti grafikus"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Sekimo kodas"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -832,6 +1090,12 @@
       "value": "Nežinoma"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -862,6 +1126,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -922,168 +1192,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "offset": 0,
diff --git a/public/intl/messages/mn-MN.json b/public/intl/messages/mn-MN.json
index 0c541031a6..013e5c88cd 100644
--- a/public/intl/messages/mn-MN.json
+++ b/public/intl/messages/mn-MN.json
@@ -41,6 +41,12 @@
       "value": "Админ"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Буцах"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Нэг хуудас үзээд гарсан"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Хотууд"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Шинэ нууц үгээ давтах"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Улс"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Өгөгдөл"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Хугацааны муж"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Веб устгах"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Мэдээлэл"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Үл хэргэсэх"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Үйлдэл"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Түүхий"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Багаас гарах"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Гарах"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Гишүүд"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Цааш"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Байхгүй"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Үйлдлийн систем"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Эзэмшигч"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Хуудас үзсэн"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Яг одоо"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Дахин үүсгэх"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Тоон үзүүлэлтийг дахин эхлүүлэх"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Нэг өдөр"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Багийн гишүүн"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Багийн эзэмшигч"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Графикийг харуулах/нуух"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Мөрдөх код"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Тодорхойгүй"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Хэрэглэгчид"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Өчигдөр"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 0,
diff --git a/public/intl/messages/ms-MY.json b/public/intl/messages/ms-MY.json
index 1bbcf235b8..e022e12270 100644
--- a/public/intl/messages/ms-MY.json
+++ b/public/intl/messages/ms-MY.json
@@ -41,6 +41,12 @@
       "value": "Pentadbir"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Kembali"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Kadar lantunan"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Sahkan kata laluan"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Negara"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Julat tarikh"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Padam laman web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Ketepikan"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Peristiwa"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Mentah"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +511,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +535,24 @@
       "value": "Log keluar"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +565,12 @@
       "value": "Lebih banyak lagi"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +589,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistem operasi"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +607,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Paparan halaman"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +689,12 @@
       "value": "Siaran langsung"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +713,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +755,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -611,6 +821,12 @@
       "value": "Satu hari"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +857,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +929,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Kod penjejakan"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +977,12 @@
       "value": "Tidak diketahui"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1013,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1079,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/my-MM.json b/public/intl/messages/my-MM.json
new file mode 100644
index 0000000000..3995a22b06
--- /dev/null
+++ b/public/intl/messages/my-MM.json
@@ -0,0 +1,1296 @@
+{
+  "label.access-code": [
+    {
+      "type": 0,
+      "value": "ဝင်ခွင့်ကုဒ်"
+    }
+  ],
+  "label.actions": [
+    {
+      "type": 0,
+      "value": "လုပ်ဆောင်ချက်များ"
+    }
+  ],
+  "label.activity-log": [
+    {
+      "type": 0,
+      "value": "လုပ်ဆောင်ချက်စာရင်း"
+    }
+  ],
+  "label.add": [
+    {
+      "type": 0,
+      "value": "ထပ်ထည့်မည်"
+    }
+  ],
+  "label.add-description": [
+    {
+      "type": 0,
+      "value": "အကြောင်းအရာဖော်ပြချက် ထည့်မည်"
+    }
+  ],
+  "label.add-website": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်ထည့်မည်"
+    }
+  ],
+  "label.admin": [
+    {
+      "type": 0,
+      "value": "အက်ဒမင်"
+    }
+  ],
+  "label.all": [
+    {
+      "type": 0,
+      "value": "အားလုံး"
+    }
+  ],
+  "label.all-time": [
+    {
+      "type": 0,
+      "value": "အချိန်အစမှအခုထိ"
+    }
+  ],
+  "label.analytics": [
+    {
+      "type": 0,
+      "value": "အန်နလစ်တစ်"
+    }
+  ],
+  "label.average-visit-time": [
+    {
+      "type": 0,
+      "value": "ဝဘက်ဘ်ဆိုဒ်တွင် ပျမ်းမျှကုန်ဆုံးချိန်"
+    }
+  ],
+  "label.back": [
+    {
+      "type": 0,
+      "value": "နောက်သို့"
+    }
+  ],
+  "label.bounce-rate": [
+    {
+      "type": 0,
+      "value": "Bounce နှုန်း"
+    }
+  ],
+  "label.browsers": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဘရောင်ဇာများ"
+    }
+  ],
+  "label.cancel": [
+    {
+      "type": 0,
+      "value": "မလုပ်တော့ပါ"
+    }
+  ],
+  "label.change-password": [
+    {
+      "type": 0,
+      "value": "စကားဝှက် ပြောင်းမည်"
+    }
+  ],
+  "label.cities": [
+    {
+      "type": 0,
+      "value": "မြို့များ"
+    }
+  ],
+  "label.clear-all": [
+    {
+      "type": 0,
+      "value": "အားလုံးကိုဖျက်မည်"
+    }
+  ],
+  "label.confirm": [
+    {
+      "type": 0,
+      "value": "အတည်ပြုသည်"
+    }
+  ],
+  "label.confirm-password": [
+    {
+      "type": 0,
+      "value": "စကားဝှက်အတည်ပြုသည်"
+    }
+  ],
+  "label.continue": [
+    {
+      "type": 0,
+      "value": "ဆက်သွားမည်"
+    }
+  ],
+  "label.countries": [
+    {
+      "type": 0,
+      "value": "နိုင်ငံများ"
+    }
+  ],
+  "label.create-team": [
+    {
+      "type": 0,
+      "value": "Team ပြုလုပ်မည်"
+    }
+  ],
+  "label.create-user": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူထည့်မည်"
+    }
+  ],
+  "label.created": [
+    {
+      "type": 0,
+      "value": "ပြုလုပ်ပြီးသော"
+    }
+  ],
+  "label.current-password": [
+    {
+      "type": 0,
+      "value": "လက်ရှိစကားဝှက်"
+    }
+  ],
+  "label.custom-range": [
+    {
+      "type": 0,
+      "value": "အချိန်အပိုင်းအခြားရွေးရန်"
+    }
+  ],
+  "label.dashboard": [
+    {
+      "type": 0,
+      "value": "ဒက်ရှ်ဘုတ်"
+    }
+  ],
+  "label.data": [
+    {
+      "type": 0,
+      "value": "ဒေတာ"
+    }
+  ],
+  "label.date-range": [
+    {
+      "type": 0,
+      "value": "ရက်အပိုင်းအခြား"
+    }
+  ],
+  "label.default-date-range": [
+    {
+      "type": 0,
+      "value": "ပုံသေ ရက်အပိုင်းအခြား"
+    }
+  ],
+  "label.delete": [
+    {
+      "type": 0,
+      "value": "ဖျက်မည်"
+    }
+  ],
+  "label.delete-team": [
+    {
+      "type": 0,
+      "value": "Team ကိုဖျက်မည်"
+    }
+  ],
+  "label.delete-user": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူကိုဖျက်မည်"
+    }
+  ],
+  "label.delete-website": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်ကိုဖျက်မည်"
+    }
+  ],
+  "label.desktop": [
+    {
+      "type": 0,
+      "value": "စားပွဲတင်ကွန်ပျူတာ"
+    }
+  ],
+  "label.details": [
+    {
+      "type": 0,
+      "value": "အသေးစိတ်"
+    }
+  ],
+  "label.devices": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသည့် ကိရိယာများ"
+    }
+  ],
+  "label.dismiss": [
+    {
+      "type": 0,
+      "value": "ပိတ်ပါ"
+    }
+  ],
+  "label.domain": [
+    {
+      "type": 0,
+      "value": "ဒိုမိန်း"
+    }
+  ],
+  "label.dropoff": [
+    {
+      "type": 0,
+      "value": "Dropoff"
+    }
+  ],
+  "label.edit": [
+    {
+      "type": 0,
+      "value": "ပြုပြင်မည်"
+    }
+  ],
+  "label.edit-dashboard": [
+    {
+      "type": 0,
+      "value": "ဒက်ရှ်ဘုတ်ကို ပြုပြင်မည်"
+    }
+  ],
+  "label.enable-share-url": [
+    {
+      "type": 0,
+      "value": "ဝေငှခြင်းကိုလင့်ကို ဖွင့်မည်"
+    }
+  ],
+  "label.event": [
+    {
+      "type": 0,
+      "value": "အဖြစ်အပျက်"
+    }
+  ],
+  "label.event-data": [
+    {
+      "type": 0,
+      "value": "အဖြစ်အပျက် ဒေတာ"
+    }
+  ],
+  "label.events": [
+    {
+      "type": 0,
+      "value": "အဖြစ်အပျက်များ"
+    }
+  ],
+  "label.field": [
+    {
+      "type": 0,
+      "value": "Field အမည်"
+    }
+  ],
+  "label.fields": [
+    {
+      "type": 0,
+      "value": "Field အမည်များ"
+    }
+  ],
+  "label.filter-combined": [
+    {
+      "type": 0,
+      "value": "ပေါင်းစပ်ပြီး"
+    }
+  ],
+  "label.filter-raw": [
+    {
+      "type": 0,
+      "value": "အရှိအတိုင်း"
+    }
+  ],
+  "label.funnel": [
+    {
+      "type": 0,
+      "value": "ဖန်နယ်"
+    }
+  ],
+  "label.insights": [
+    {
+      "type": 0,
+      "value": "အသေးစိတ်သိမြင်နိုင်ရန်"
+    }
+  ],
+  "label.join": [
+    {
+      "type": 0,
+      "value": "ဝင်မည်"
+    }
+  ],
+  "label.join-team": [
+    {
+      "type": 0,
+      "value": "အသင်းဝင်မည်"
+    }
+  ],
+  "label.language": [
+    {
+      "type": 0,
+      "value": "ဘာသာစကား"
+    }
+  ],
+  "label.languages": [
+    {
+      "type": 0,
+      "value": "ဘာသာစကားများ"
+    }
+  ],
+  "label.laptop": [
+    {
+      "type": 0,
+      "value": "လက်တော့ပ်"
+    }
+  ],
+  "label.last-days": [
+    {
+      "type": 0,
+      "value": "လွန်ခဲ့သော "
+    },
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " ရက်က"
+    }
+  ],
+  "label.last-hours": [
+    {
+      "type": 0,
+      "value": "လွန်ခဲ့သော "
+    },
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " နာရီက"
+    }
+  ],
+  "label.leave": [
+    {
+      "type": 0,
+      "value": "ထွက်မည်"
+    }
+  ],
+  "label.leave-team": [
+    {
+      "type": 0,
+      "value": "အသင်းမှထွက်မည်"
+    }
+  ],
+  "label.login": [
+    {
+      "type": 0,
+      "value": "လော့ဂ်အင်"
+    }
+  ],
+  "label.logout": [
+    {
+      "type": 0,
+      "value": "လော့ဂ်အောက်လုပ်မည်"
+    }
+  ],
+  "label.members": [
+    {
+      "type": 0,
+      "value": "အဖွဲ့ဝင်များ"
+    }
+  ],
+  "label.mobile": [
+    {
+      "type": 0,
+      "value": "မိုဘိုင်း"
+    }
+  ],
+  "label.more": [
+    {
+      "type": 0,
+      "value": "နောက်ထပ်"
+    }
+  ],
+  "label.name": [
+    {
+      "type": 0,
+      "value": "အမည်"
+    }
+  ],
+  "label.new-password": [
+    {
+      "type": 0,
+      "value": "စကားဝှက်အသစ်"
+    }
+  ],
+  "label.none": [
+    {
+      "type": 0,
+      "value": "မရှိပါ"
+    }
+  ],
+  "label.operating-systems": [
+    {
+      "type": 0,
+      "value": "ကွန်ပျူတာလည်ပတ်မှုစနစ်"
+    }
+  ],
+  "label.owner": [
+    {
+      "type": 0,
+      "value": "ပိုင်ဆိုင်သူ"
+    }
+  ],
+  "label.page-views": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်ကြည့်ရှုသူ"
+    }
+  ],
+  "label.pages": [
+    {
+      "type": 0,
+      "value": "စာမျက်နှာများ"
+    }
+  ],
+  "label.password": [
+    {
+      "type": 0,
+      "value": "စကားဝှက်"
+    }
+  ],
+  "label.powered-by": [
+    {
+      "type": 1,
+      "value": "name"
+    },
+    {
+      "type": 0,
+      "value": " ထောက်ပံ့သည်"
+    }
+  ],
+  "label.profile": [
+    {
+      "type": 0,
+      "value": "ပရိုဖိုင်း"
+    }
+  ],
+  "label.queries": [
+    {
+      "type": 0,
+      "value": "Queries (ကွာရီများ)"
+    }
+  ],
+  "label.query": [
+    {
+      "type": 0,
+      "value": "Query (ကွာရီ)"
+    }
+  ],
+  "label.query-parameters": [
+    {
+      "type": 0,
+      "value": "Query parameters (ကွာရီပါရာမီတာများ)"
+    }
+  ],
+  "label.realtime": [
+    {
+      "type": 0,
+      "value": "အချိန်နှင့်တပြေးညီ"
+    }
+  ],
+  "label.referrers": [
+    {
+      "type": 0,
+      "value": "ရည်ညွှန်းမှုများ"
+    }
+  ],
+  "label.refresh": [
+    {
+      "type": 0,
+      "value": "Refresh လုပ်မည်"
+    }
+  ],
+  "label.regenerate": [
+    {
+      "type": 0,
+      "value": "ပြန်ထုတ်မည်"
+    }
+  ],
+  "label.regions": [
+    {
+      "type": 0,
+      "value": "ဒေသများ"
+    }
+  ],
+  "label.remove": [
+    {
+      "type": 0,
+      "value": "ဖျက်မည်"
+    }
+  ],
+  "label.reports": [
+    {
+      "type": 0,
+      "value": "တင်ပြမှုများ"
+    }
+  ],
+  "label.required": [
+    {
+      "type": 0,
+      "value": "လိုအပ်သည်"
+    }
+  ],
+  "label.reset": [
+    {
+      "type": 0,
+      "value": "ပြန်စမည်"
+    }
+  ],
+  "label.reset-website": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်ဒေတာကိုဖျက်မည်"
+    }
+  ],
+  "label.role": [
+    {
+      "type": 0,
+      "value": "အခန်းကဏ္ဍ"
+    }
+  ],
+  "label.run-query": [
+    {
+      "type": 0,
+      "value": "Query ကိုလုပ်ဆောင်မည်"
+    }
+  ],
+  "label.save": [
+    {
+      "type": 0,
+      "value": "သိမ်းဆည်းမည်"
+    }
+  ],
+  "label.screens": [
+    {
+      "type": 0,
+      "value": "မြင်ကွင်းများ"
+    }
+  ],
+  "label.select-date": [
+    {
+      "type": 0,
+      "value": "ရက်ရွေးပါ"
+    }
+  ],
+  "label.select-website": [
+    {
+      "type": 0,
+      "value": "ဝဘက်ဘ်ဆိုဒ်ရွေးပါ"
+    }
+  ],
+  "label.sessions": [
+    {
+      "type": 0,
+      "value": "ဆက်ရှင်များ"
+    }
+  ],
+  "label.settings": [
+    {
+      "type": 0,
+      "value": "ဆက်တင်များ"
+    }
+  ],
+  "label.share-url": [
+    {
+      "type": 0,
+      "value": "URL ကိုရှဲမည်"
+    }
+  ],
+  "label.single-day": [
+    {
+      "type": 0,
+      "value": "တစ်ရက်အတွင်း"
+    }
+  ],
+  "label.tablet": [
+    {
+      "type": 0,
+      "value": "တက်ဘလက်"
+    }
+  ],
+  "label.team": [
+    {
+      "type": 0,
+      "value": "အသင်း"
+    }
+  ],
+  "label.team-guest": [
+    {
+      "type": 0,
+      "value": "အသင်း ဧည့်သည်"
+    }
+  ],
+  "label.team-id": [
+    {
+      "type": 0,
+      "value": "အသင်း အိုင်ဒီ"
+    }
+  ],
+  "label.team-member": [
+    {
+      "type": 0,
+      "value": "အသင်းဝင်"
+    }
+  ],
+  "label.team-owner": [
+    {
+      "type": 0,
+      "value": "အသင်းကိုပိုင်ဆိုင်သူ"
+    }
+  ],
+  "label.teams": [
+    {
+      "type": 0,
+      "value": "အသင်းများ"
+    }
+  ],
+  "label.theme": [
+    {
+      "type": 0,
+      "value": "Theme (အပြင်အဆင်)"
+    }
+  ],
+  "label.this-month": [
+    {
+      "type": 0,
+      "value": "ယခုလ"
+    }
+  ],
+  "label.this-week": [
+    {
+      "type": 0,
+      "value": "ယခုအပတ်"
+    }
+  ],
+  "label.this-year": [
+    {
+      "type": 0,
+      "value": "ယခုနှစ်"
+    }
+  ],
+  "label.timezone": [
+    {
+      "type": 0,
+      "value": "အချိန်ဇုန်"
+    }
+  ],
+  "label.title": [
+    {
+      "type": 0,
+      "value": "ခေါင်းစဥ်"
+    }
+  ],
+  "label.today": [
+    {
+      "type": 0,
+      "value": "ယနေ့"
+    }
+  ],
+  "label.toggle-charts": [
+    {
+      "type": 0,
+      "value": "ဇယားများကို အဖွင့်အပိတ်လုပ်မည်"
+    }
+  ],
+  "label.tracking-code": [
+    {
+      "type": 0,
+      "value": "ထရက်လုပ်သည့် ကုဒ်"
+    }
+  ],
+  "label.unique-visitors": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်သူ (ထပ်ခြင်းမရှိ)"
+    }
+  ],
+  "label.unknown": [
+    {
+      "type": 0,
+      "value": "မသိသော"
+    }
+  ],
+  "label.url": [
+    {
+      "type": 0,
+      "value": "URL"
+    }
+  ],
+  "label.urls": [
+    {
+      "type": 0,
+      "value": "URL များ"
+    }
+  ],
+  "label.user": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူ"
+    }
+  ],
+  "label.username": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူအမည်"
+    }
+  ],
+  "label.users": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူများ"
+    }
+  ],
+  "label.view": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်ကြည့်ရှုမှု"
+    }
+  ],
+  "label.view-details": [
+    {
+      "type": 0,
+      "value": "အသေးစိတ်ကို ကြည့်ရှုမည်"
+    }
+  ],
+  "label.view-only": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်ကြည့်ရှုမှုများသာ"
+    }
+  ],
+  "label.views": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်ကြည့်ရှုမှုများ"
+    }
+  ],
+  "label.visitors": [
+    {
+      "type": 0,
+      "value": "ဝင်ရောက်ကြည့်ရှုသူများ"
+    }
+  ],
+  "label.website": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်"
+    }
+  ],
+  "label.website-id": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ် အိုင်ဒီ"
+    }
+  ],
+  "label.websites": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်များ"
+    }
+  ],
+  "label.window": [
+    {
+      "type": 0,
+      "value": "ဝင်းဒိုး"
+    }
+  ],
+  "label.yesterday": [
+    {
+      "type": 0,
+      "value": "မနေ့က"
+    }
+  ],
+  "labels.after": [
+    {
+      "type": 0,
+      "value": "ပြီးနောက်"
+    }
+  ],
+  "labels.average": [
+    {
+      "type": 0,
+      "value": "ပျမ်းမျှ"
+    }
+  ],
+  "labels.before": [
+    {
+      "type": 0,
+      "value": "မတိုင်မီ"
+    }
+  ],
+  "labels.breakdown": [
+    {
+      "type": 0,
+      "value": "ခွဲခြမ်းစိတ်ဖြာမှု"
+    }
+  ],
+  "labels.contains": [
+    {
+      "type": 0,
+      "value": "ပါဝင်သည်"
+    }
+  ],
+  "labels.create-report": [
+    {
+      "type": 0,
+      "value": "ရီပို့လုပ်မည်"
+    }
+  ],
+  "labels.description": [
+    {
+      "type": 0,
+      "value": "ရှင်းပြချက်"
+    }
+  ],
+  "labels.does-not-contain": [
+    {
+      "type": 0,
+      "value": "မပါဝင်ပါ"
+    }
+  ],
+  "labels.does-not-equal": [
+    {
+      "type": 0,
+      "value": "မတူညီပါ"
+    }
+  ],
+  "labels.equals": [
+    {
+      "type": 0,
+      "value": "တူညီသည်"
+    }
+  ],
+  "labels.false": [
+    {
+      "type": 0,
+      "value": "မှားသည်"
+    }
+  ],
+  "labels.filters": [
+    {
+      "type": 0,
+      "value": "Filter များ"
+    }
+  ],
+  "labels.greater-than": [
+    {
+      "type": 0,
+      "value": "ထက်ပို၍ကြီးသည်"
+    }
+  ],
+  "labels.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "ထက်ပို၍ကြီးသည်သို့မဟုတ်တူသည်"
+    }
+  ],
+  "labels.less-than": [
+    {
+      "type": 0,
+      "value": "ထက်ပို၍ငယ်သည်"
+    }
+  ],
+  "labels.less-than-equals": [
+    {
+      "type": 0,
+      "value": "ထက်ပို၍ငယ်သည်သို့မဟုတ်တူသည်"
+    }
+  ],
+  "labels.max": [
+    {
+      "type": 0,
+      "value": "အများဆုံး"
+    }
+  ],
+  "labels.min": [
+    {
+      "type": 0,
+      "value": "အနည်းဆုံး"
+    }
+  ],
+  "labels.overview": [
+    {
+      "type": 0,
+      "value": "အပေါ်ယံမြင်ကွင်း"
+    }
+  ],
+  "labels.sum": [
+    {
+      "type": 0,
+      "value": "ပေါင်းလဒ်"
+    }
+  ],
+  "labels.total": [
+    {
+      "type": 0,
+      "value": "စုစုပေါင်း"
+    }
+  ],
+  "labels.total-records": [
+    {
+      "type": 0,
+      "value": "မှတ်တမ်းစုစုပေါင်း"
+    }
+  ],
+  "labels.true": [
+    {
+      "type": 0,
+      "value": "မှန်သည်"
+    }
+  ],
+  "labels.type": [
+    {
+      "type": 0,
+      "value": "အမျိုးအစား"
+    }
+  ],
+  "labels.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
+  "labels.untitled": [
+    {
+      "type": 0,
+      "value": "ခေါင်းစဉ်မရှိ"
+    }
+  ],
+  "labels.value": [
+    {
+      "type": 0,
+      "value": "တန်ဖိုး"
+    }
+  ],
+  "message.active-users": [
+    {
+      "type": 1,
+      "value": "x"
+    },
+    {
+      "type": 0,
+      "value": " လက်ရှိအသုံးပြုနေသူ "
+    },
+    {
+      "offset": 0,
+      "options": {
+        "one": {
+          "value": [
+            {
+              "type": 0,
+              "value": "ယောက်"
+            }
+          ]
+        },
+        "other": {
+          "value": [
+            {
+              "type": 0,
+              "value": "ယောက်"
+            }
+          ]
+        }
+      },
+      "pluralType": "cardinal",
+      "type": 6,
+      "value": "x"
+    }
+  ],
+  "message.confirm-delete": [
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": " ကို ဖျက်ရန် သေချာပါသလား?"
+    }
+  ],
+  "message.confirm-leave": [
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": " ကို ထွက်ရန် သေချာပါသလား?"
+    }
+  ],
+  "message.confirm-reset": [
+    {
+      "type": 1,
+      "value": "target"
+    },
+    {
+      "type": 0,
+      "value": " ကို ဖျက်၍ပြန်စလုပ်ရန် သေချာပါသလား?"
+    }
+  ],
+  "message.delete-account": [
+    {
+      "type": 0,
+      "value": "ဤအကောင့်ကိုဖျက်ရန် "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " ကို ရိုက်ထည့်ပေးပါ."
+    }
+  ],
+  "message.delete-website": [
+    {
+      "type": 0,
+      "value": "ဤ ဝက်ဘ်ဆိုဒ်ကိုဖျက်ရန် "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " ကို ရိုက်ထည့်ပေးပါ"
+    }
+  ],
+  "message.delete-website-warning": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ် ဒေတာအကုန် ဖျက်မည်"
+    }
+  ],
+  "message.error": [
+    {
+      "type": 0,
+      "value": "မှားယွင်းမှုတစ်ခု ရှိသွားပါသည်"
+    }
+  ],
+  "message.event-log": [
+    {
+      "type": 1,
+      "value": "url"
+    },
+    {
+      "type": 0,
+      "value": " တွင် "
+    },
+    {
+      "type": 1,
+      "value": "event"
+    }
+  ],
+  "message.go-to-settings": [
+    {
+      "type": 0,
+      "value": "ဆက်တင်သို့ သွားရန်"
+    }
+  ],
+  "message.incorrect-username-password": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူအမည် သို့မဟုတ် စကားဝှက် မှားနေသည်"
+    }
+  ],
+  "message.invalid-domain": [
+    {
+      "type": 0,
+      "value": "ဒိုမိန်း မမှန်ပါ http/https. မပါရပါ"
+    }
+  ],
+  "message.min-password-length": [
+    {
+      "type": 0,
+      "value": "အနည်းဆုံး "
+    },
+    {
+      "type": 1,
+      "value": "n"
+    },
+    {
+      "type": 0,
+      "value": " character ရှိရမည်"
+    }
+  ],
+  "message.new-version-available": [
+    {
+      "type": 0,
+      "value": "အူမာမီ "
+    },
+    {
+      "type": 1,
+      "value": "version"
+    },
+    {
+      "type": 0,
+      "value": " အသစ်ထွက်နေပါပြီ"
+    }
+  ],
+  "message.no-data-available": [
+    {
+      "type": 0,
+      "value": "ဒေတာ မရှိပါ"
+    }
+  ],
+  "message.no-event-data": [
+    {
+      "type": 0,
+      "value": "အဖြစ်အပျက်ဒေတာ မရှိပါ"
+    }
+  ],
+  "message.no-match-password": [
+    {
+      "type": 0,
+      "value": "စကားဝှက် မှားနေသည်"
+    }
+  ],
+  "message.no-results-found": [
+    {
+      "type": 0,
+      "value": "ရလဒ်မရှိပါ"
+    }
+  ],
+  "message.no-team-websites": [
+    {
+      "type": 0,
+      "value": "ဤအသင်းတွင် ဝက်ဘ်ဆိုက်မရှိသေးပါ"
+    }
+  ],
+  "message.no-teams": [
+    {
+      "type": 0,
+      "value": "အသင်း မပြုလုပ်ရသေးပါ"
+    }
+  ],
+  "message.no-users": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူ မရှိသေးပါ"
+    }
+  ],
+  "message.no-websites-configured": [
+    {
+      "type": 0,
+      "value": "ဝက်ဘ်ဆိုဒ်တစ်ခုမှ မထည့်ရသေးပါ"
+    }
+  ],
+  "message.page-not-found": [
+    {
+      "type": 0,
+      "value": "ဤစာမျက်နှာသည် မရှိပါ"
+    }
+  ],
+  "message.reset-website": [
+    {
+      "type": 0,
+      "value": "ဤ ဝက်ဘ်ဆိုဒ်ဒေတာကိုဖျက်၍ ပြန်စလုပ်ရန် အောက်တွင် "
+    },
+    {
+      "type": 1,
+      "value": "confirmation"
+    },
+    {
+      "type": 0,
+      "value": " ကို ရိုက်ထည့်ပေးပါ"
+    }
+  ],
+  "message.reset-website-warning": [
+    {
+      "type": 0,
+      "value": "ဤဝက်ဘ်ဆိုဒ်က စာရင်းအချက်အလက်များကို ဖျက်မည်၊ ဆက်တင်ဒေတာများ မပါပါ"
+    }
+  ],
+  "message.saved": [
+    {
+      "type": 0,
+      "value": "မှတ်သားပြီး"
+    }
+  ],
+  "message.share-url": [
+    {
+      "type": 0,
+      "value": "သင့်ဝက်ဆိုဒ်ဘ်၏ စာရင်းအချက်အလက်များကို အောက်ပါ URL တွင် ဝင်ရောက်ကြည့်ရှုနိုင်သည်"
+    }
+  ],
+  "message.team-already-member": [
+    {
+      "type": 0,
+      "value": "ဤအသင်းတွင် ဝင်ပြီးသားဖြစ်နေသည်"
+    }
+  ],
+  "message.team-not-found": [
+    {
+      "type": 0,
+      "value": "အသင်း မရှိပါ"
+    }
+  ],
+  "message.team-websites-info": [
+    {
+      "type": 0,
+      "value": "ဤဝက်ဘ်ဆိုဒ်များကို အသင်းထဲမှ လူတိုင်းဝင်ကြည့်နိုင်သည်"
+    }
+  ],
+  "message.tracking-code": [
+    {
+      "type": 0,
+      "value": "ဤဝက်ဘ်ဆိုဒ်၏ ဒေတာကိုကောက်ခံရန် အောက်ပါ code ကို သင်၏ HTML တွင်ထည့်ပါ"
+    }
+  ],
+  "message.user-deleted": [
+    {
+      "type": 0,
+      "value": "အသုံးပြုသူ ဖျက်ပြီးပါပြီ"
+    }
+  ],
+  "message.visitor-log": [
+    {
+      "type": 1,
+      "value": "country"
+    },
+    {
+      "type": 0,
+      "value": " မှ "
+    },
+    {
+      "type": 1,
+      "value": "browser"
+    },
+    {
+      "type": 0,
+      "value": " ဖြင့် "
+    },
+    {
+      "type": 1,
+      "value": "os"
+    },
+    {
+      "type": 0,
+      "value": " "
+    },
+    {
+      "type": 1,
+      "value": "device"
+    },
+    {
+      "type": 0,
+      "value": " တွင် ဝင်ရောက်ကြည့်ရှုသူ"
+    }
+  ]
+}
diff --git a/public/intl/messages/nb-NO.json b/public/intl/messages/nb-NO.json
index 69d9c6dcac..82576ff89d 100644
--- a/public/intl/messages/nb-NO.json
+++ b/public/intl/messages/nb-NO.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Tilbake"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Avvisningsfrekvens"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Godkjenn passord"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Land"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datointervall"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Slett nettstedet"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Avbryt"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Arrangementer"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Rå"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Logg ut"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Mer"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operativsystemer"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Eier"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Sidevisninger"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Sanntid"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Nullstill statistikk"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Enkelt dag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Veksle grafer"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Sporingskode"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Ukjent"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/nl-NL.json b/public/intl/messages/nl-NL.json
index 878dddfaa6..5ee25206be 100644
--- a/public/intl/messages/nl-NL.json
+++ b/public/intl/messages/nl-NL.json
@@ -41,6 +41,12 @@
       "value": "Beheerder"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Terug"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bouncepercentage"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Steden"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Wachtwoord bevestigen"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Landen"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Gegevens"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datumbereik"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Website verwijderen"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Informatie"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Negeren"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Gebeurtenissen"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Ruw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Verlaat team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Uitloggen"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Gebruikers"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Toon meer"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Geen"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Besturingssystemen"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Eigenaar"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Paginaweergaven"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Actueel"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Opnieuw genereren"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Statistieken opnieuw instellen"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Enkele dag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Teamlid"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Teameigenaar"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Grafieken tonen/verbergen"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Volgcode"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Onbekend"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Gebruikers"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Gisteren"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/pl-PL.json b/public/intl/messages/pl-PL.json
index e88b6a83a3..6da1ff7add 100644
--- a/public/intl/messages/pl-PL.json
+++ b/public/intl/messages/pl-PL.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Po"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analityka"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Średnia"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Powrót"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Przed"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Współczynnik odrzuceń"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Rozbicie"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Miasta"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Potwierdź hasło"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Zawiera"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Kraje"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Stwórz raport"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Zakres dat"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Usuń witrynę"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Opis"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Szczegóły"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Odrzuć"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Nie zawiera"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Zdarzenia"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "Fałsz"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Surowe dane"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filtry"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Lejek"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Większe niż"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Większe niż lub równe"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Równe"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Nie jest równe"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Opuść zespół"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Mniejsze niż"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Mniejsze niż lub równe"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Wyloguj"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Maks"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Członkowie"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Więcej"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Brak"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
+    {
+      "type": 0,
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
     {
       "type": 0,
-      "value": "System operacyjny"
+      "value": "Przegląd"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Właściciel"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Wyświetlenia strony"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Czas rzeczywisty"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Wygeneruj ponownie"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Zresetuj statystyki"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "W tym dniu"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Suma"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Członek zespołu"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Właściciel zespołu"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Przełącz wykresy"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "W sumie"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Suma rekordów"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Kod śledzenia"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "Prawda"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Typ"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unikalne"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Nieznany"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Bez tytułu"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Użytkownicy"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Wartość"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Wczoraj"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "Po"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Średnia"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Przed"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Rozbicie"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Zawiera"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Stwórz raport"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Opis"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Nie zawiera"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Nie jest równe"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Równe"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "Fałsz"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filtry"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Większe niż"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Większe niż lub równe"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Mniejsze niż"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Mniejsze niż lub równe"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Maks"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Przegląd"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Suma"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "W sumie"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Suma rekordów"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "Prawda"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Typ"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unikalne"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Bez tytułu"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Wartość"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/pt-BR.json b/public/intl/messages/pt-BR.json
index e3d7e33da9..ba508a5040 100644
--- a/public/intl/messages/pt-BR.json
+++ b/public/intl/messages/pt-BR.json
@@ -41,6 +41,12 @@
       "value": "Administrador"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "Depois"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Estatísticas"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Voltar"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Antes"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Taxa de rejeição"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cidades"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirme a nova senha"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Países"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Criar relatório"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Intervalo de datas"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Remover site"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Descrição"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Detalhes"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Dispensar"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Eventos"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Dados brutos"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funil"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Maior que"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Maior que ou igual"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Sair do time"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Menor que"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Menor que ou igual"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Sair"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Membros"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Mais"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Nenhum"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemas operacionais"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Proprietário"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Visualizações de página"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Tempo real"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regerar"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Redefinir estatísticas"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Dia específico"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Membro"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Proprietário"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Mostrar/Esconder gráficos"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Código de rastreamento"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Tipo"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Único"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Desconhecido"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Sem título"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Usuários"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Valor"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Ontem"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "Depois"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Antes"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Criar relatório"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Descrição"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Maior que"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Maior que ou igual"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Menor que"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Menor que ou igual"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Tipo"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Único"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Sem título"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Valor"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/pt-PT.json b/public/intl/messages/pt-PT.json
index 3120b272ce..a6431fb3b6 100644
--- a/public/intl/messages/pt-PT.json
+++ b/public/intl/messages/pt-PT.json
@@ -41,6 +41,12 @@
       "value": "Administrador"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Voltar"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Taxa de rejeição"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmar senha"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Países"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Intervalo de datas"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Eliminar website"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Ignorar"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Eventos"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Dados brutos"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Sair"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Mais"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sistemas operativos"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Proprietário"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Visualizações da página"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Tempo real"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Repor estatísticas"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Dia único"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Alternar gráficos"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Código de rastreamento"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Desconhecido"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ro-RO.json b/public/intl/messages/ro-RO.json
index 0694cf520b..1438ab4130 100644
--- a/public/intl/messages/ro-RO.json
+++ b/public/intl/messages/ro-RO.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Înapoi"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Rata de respingere"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Confirmare parolă"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Țări"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Interval de date"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Ștergere site web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Renunță"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Evenimente"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Brut"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Iesire din cont"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Mai mult"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Sisteme de operare"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Vizualizări de pagină"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Realtime"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Resetează statisticile pentru site"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "O singură zi"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Schimbă graficele"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Cod de urmărire"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Necunoscut"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ru-RU.json b/public/intl/messages/ru-RU.json
index 317fcbeebf..b3213e6797 100644
--- a/public/intl/messages/ru-RU.json
+++ b/public/intl/messages/ru-RU.json
@@ -41,6 +41,12 @@
       "value": "Администратор"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Аналитика"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Назад"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Отказы"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Города"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Подтвердить пароль"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Страны"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Данные"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Диапазон дат"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Удалить сайт"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Подробности"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Отклонить"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "События"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Сырые данные"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Покинуть команду"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Выйти"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Участники"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Больше"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Не указано"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Операционные системы"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Владелец"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Просмотры страниц"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Реальное время"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Обновить"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Сбросить статистику"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Один день"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Член команды"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Владелец команды"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Показать/скрыть графики"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Код отслеживания"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Неизвестно"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Пользователи"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Вчера"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/si-LK.json b/public/intl/messages/si-LK.json
index ccee2f6c73..f4e5bca2f7 100644
--- a/public/intl/messages/si-LK.json
+++ b/public/intl/messages/si-LK.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "ආපසු"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Bounce rate"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "මුරපදය සත්‍යාපනය කරන්න"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Countries"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "දින පරාසය"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "වෙබ් අඩවිය මකන්න"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "මගහරින්න"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Events"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Raw"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "පිටවීම"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "තවත්"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "කිසිවක් නැත"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operating systems"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "හිමිකරු"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Page views"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "තත්ය කාල"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "සංඛ්යා ලේඛන නැවත සකසන්න"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "තනි දවස"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "ලුහුබැඳීමේ කේතය"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "නොදනී"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "ඊයේ"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/sk-SK.json b/public/intl/messages/sk-SK.json
index 9febb0adff..b7e2914a9f 100644
--- a/public/intl/messages/sk-SK.json
+++ b/public/intl/messages/sk-SK.json
@@ -41,6 +41,12 @@
       "value": "Administrátor"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Späť"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Okamžité opustenie"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Potvrdiť heslo"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Zem"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Obdobie"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Zmazať web"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Odísť"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Udalosti"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Nezpracované"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Odhlásiť"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Viac"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operačný systém"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Zobrazenie stánok"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Aktuálne"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Jeden deň"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Sledovací kód"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Neznámý"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/sl-SI.json b/public/intl/messages/sl-SI.json
index 813a9c7f2b..a3af95cb8f 100644
--- a/public/intl/messages/sl-SI.json
+++ b/public/intl/messages/sl-SI.json
@@ -41,6 +41,12 @@
       "value": "Administrator"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Nazaj"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Zapustna stopnja"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Potrditev gesla"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Države"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Časovni razpon"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Izbriši spletno mesto"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Opusti"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Dogodki"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Neobdelane meritve"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Odjava"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Več"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operacijski sistemi"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Ogledi strani"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "V realnem času"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "En dan"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Koda za sledenje"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Neznano"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/sv-SE.json b/public/intl/messages/sv-SE.json
index e55ae25a6a..4a7f4130cd 100644
--- a/public/intl/messages/sv-SE.json
+++ b/public/intl/messages/sv-SE.json
@@ -41,6 +41,12 @@
       "value": "Administratör"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analys"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Tillbaka"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Avvisningfrekvens"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Städer"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Bekräfta lösenord"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Länder"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Datumomfång"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Radera webbsajt"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Detailjer"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Avbryt"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Händelser"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Rådata"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Lämna team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Logga ut"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Medlemmar"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Mer"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "Inga"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Operativsystem"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Ägare"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Sidvisningar"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Realtid"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerera"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Återställ statistik"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "En dag"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team-medlem"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team-ägare"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Visa/göm grafer"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Spårningskod"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Okänd"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Igår"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ta-IN.json b/public/intl/messages/ta-IN.json
index 5afccd0ede..90fb9ebf1b 100644
--- a/public/intl/messages/ta-IN.json
+++ b/public/intl/messages/ta-IN.json
@@ -41,6 +41,12 @@
       "value": "நிர்வாகியைச் சேர்க்க"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "பின்னால்"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "துள்ளல் விகிதம்"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "கடவுச்சொல்லை உறுதிப்படுத்தவும்"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "நாடுகள்"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "தேதி வரம்பு"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "வலைத்தளத்தை நீக்கு"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "நீக்கு"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "நிகழ்வுகள்"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "மூல"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "வெளியேறு"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "மேலும்"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "இயக்க முறைமைகள்"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "பக்க காட்சிகள்"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "தற்போதைய"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "ஒரு நாள்"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "கண்காணிப்பு குறியீடு"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "தெரியாத"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/th-TH.json b/public/intl/messages/th-TH.json
index 092c3fb849..c30a9d61f4 100644
--- a/public/intl/messages/th-TH.json
+++ b/public/intl/messages/th-TH.json
@@ -41,6 +41,12 @@
       "value": "ผู้ดูแลระบบ"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "ย้อนกลับ"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "อัตราตีกลับ"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "ยืนยันรหัสผ่าน"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "ประเทศ"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "ตั้งแต่วันที่"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "ลบเว็บไซต์"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "ยกเลิก"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "เหตุการณ์"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "ข้อมูลดิบ"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +511,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +535,24 @@
       "value": "ออกจากระบบ"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +565,12 @@
       "value": "เพิ่มเติม"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +589,16 @@
       "value": "ไม่ได้กำหนด"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "ระบบปฏิบัติการ"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +607,36 @@
       "value": "เจ้าของ"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "การเข้าชม"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +689,12 @@
       "value": "เรียลไทม์"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +713,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +755,12 @@
       "value": "รีเซตข้อมูลสถิติ"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -611,6 +821,12 @@
       "value": "วันที่"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +857,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +929,42 @@
       "value": "เปิด/ปิดแผนภูมิ"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "โค้ดสำหรับใช้ติดตาม"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +977,12 @@
       "value": "ไม่รู้จัก"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1013,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1079,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 0,
diff --git a/public/intl/messages/tr-TR.json b/public/intl/messages/tr-TR.json
index 6f5c6e3e89..138681adba 100644
--- a/public/intl/messages/tr-TR.json
+++ b/public/intl/messages/tr-TR.json
@@ -41,6 +41,12 @@
       "value": "Yönetici"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Geri"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Çıkma oranı"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Parolayı onayla"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Ülkeler"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Tarih aralığı"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Web sitesini sil"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Reddet"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Olaylar"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Ham"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Çıkış Yap"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Detaylı göster"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "İşletim sistemi"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Owner"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Sayfa görünümü"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "Gerçek Zamanlı"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Reset statistics"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Tekil gün"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Toggle charts"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "İzleme kodu"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Bilinmeyen"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/uk-UA.json b/public/intl/messages/uk-UA.json
index 5f54c972a4..bdc2d345b4 100644
--- a/public/intl/messages/uk-UA.json
+++ b/public/intl/messages/uk-UA.json
@@ -41,6 +41,12 @@
       "value": "Адміністратор"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Назад"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Показник відмов"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Підтвердити пароль"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Країни"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Діапазон дат"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Видалити сайт"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Відхилити"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Події"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Сирі дані"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "Вийти"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "Більше"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Операційні системи"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "Власник"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Перегляди сторінок"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "У реальному часі"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "Скинути статистику сайту"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "Один день"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "Переключити графіки"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Код для відслідковування"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "Невідомо"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/ur-PK.json b/public/intl/messages/ur-PK.json
index adf1eb311e..2005bc7190 100644
--- a/public/intl/messages/ur-PK.json
+++ b/public/intl/messages/ur-PK.json
@@ -41,6 +41,12 @@
       "value": "منتظم"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "پیچھے"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "اچھال کی شرح"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "پاس ورڈ کی تصدیق کریں"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "ممالک"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "تاریخ کی حد"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "ویب سائٹ مٹایں"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "مسترد کریں"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "واقعات"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "خام"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "لاگ آوٹ"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "مزید"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "آپریٹنگ سسٹمز"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "مالک"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "صفحہ کے نظارے"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "براہ راست"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "اعدادوشمار کو دوبارہ ترتیب دیں"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "ایک دن"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "چارٹ تبدیل کریں"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "ٹریکنگ کوڈ"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "نامعلوم"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/vi-VN.json b/public/intl/messages/vi-VN.json
index d0b3b69b9f..9fe0dd4ed1 100644
--- a/public/intl/messages/vi-VN.json
+++ b/public/intl/messages/vi-VN.json
@@ -41,6 +41,12 @@
       "value": "Quản trị"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "Quay về"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "Tỷ lệ thoát trang"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "Xác nhận mật khẩu"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "Quốc gia"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "Phạm vi ngày"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "Xóa website"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "Loại trừ"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "Sự kiện"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "Gốc"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -379,6 +511,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -391,12 +535,24 @@
       "value": "Đăng xuất"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -409,6 +565,12 @@
       "value": "Thêm"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -427,10 +589,16 @@
       "value": "None"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "Hệ điều hành"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -439,12 +607,36 @@
       "value": "Chủ sở hữu"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "Lượt xem"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -497,6 +689,12 @@
       "value": "Thời gian thực"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -515,6 +713,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -551,6 +755,12 @@
       "value": "Tái thiết lập thống kê"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -611,6 +821,12 @@
       "value": "Trong ngày"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -641,12 +857,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -701,12 +929,42 @@
       "value": "Bật/tắt biểu đồ"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "Mã theo dõi"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -719,6 +977,12 @@
       "value": "Không rõ"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -749,6 +1013,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -809,168 +1079,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 1,
diff --git a/public/intl/messages/zh-CN.json b/public/intl/messages/zh-CN.json
index 29a4ea1fcc..71234564da 100644
--- a/public/intl/messages/zh-CN.json
+++ b/public/intl/messages/zh-CN.json
@@ -41,6 +41,12 @@
       "value": "管理员"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "之后"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "分析"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "平均"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "返回"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "之前"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "跳出率"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "故障"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "市/县"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "确认密码"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "包含"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "国家/地区"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "创建报告"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "统计数据"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "时间段"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "删除网站"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "描述"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "详细信息"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "关闭"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "不包含"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -242,7 +326,7 @@
   "label.dropoff": [
     {
       "type": 0,
-      "value": "Dropoff"
+      "value": "丢弃"
     }
   ],
   "label.edit": [
@@ -266,13 +350,13 @@
   "label.event": [
     {
       "type": 0,
-      "value": "Event"
+      "value": "事件"
     }
   ],
   "label.event-data": [
     {
       "type": 0,
-      "value": "Event data"
+      "value": "事件数据"
     }
   ],
   "label.events": [
@@ -281,6 +365,12 @@
       "value": "行为类别"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "否"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,16 +395,58 @@
       "value": "原始"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "筛选"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
-      "value": "Funnel"
+      "value": "分析"
+    }
+  ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
     }
   ],
   "label.insights": [
     {
       "type": 0,
-      "value": "Insights"
+      "value": "见解"
+    }
+  ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "等于"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "不等于"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
     }
   ],
   "label.join": [
@@ -387,6 +519,18 @@
       "value": "离开团队"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "少于"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "少于等于"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "退出"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "最大"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "成员"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "最小"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "更多"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "无"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
+    {
+      "type": 0,
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
     {
       "type": 0,
-      "value": "操作系统"
+      "value": "概览"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "所有者"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "页面浏览量"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -494,7 +686,7 @@
   "label.query": [
     {
       "type": 0,
-      "value": "Query"
+      "value": "查询"
     }
   ],
   "label.query-parameters": [
@@ -509,6 +701,12 @@
       "value": "实时"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -527,6 +725,12 @@
       "value": "重新生成"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -542,7 +746,7 @@
   "label.reports": [
     {
       "type": 0,
-      "value": "Reports"
+      "value": "报告"
     }
   ],
   "label.required": [
@@ -563,6 +767,12 @@
       "value": "重置统计数据"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -572,7 +782,7 @@
   "label.run-query": [
     {
       "type": 0,
-      "value": "Run query"
+      "value": "查询"
     }
   ],
   "label.save": [
@@ -590,7 +800,7 @@
   "label.select-date": [
     {
       "type": 0,
-      "value": "Select date"
+      "value": "选择数据"
     }
   ],
   "label.select-website": [
@@ -623,6 +833,12 @@
       "value": "单日"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "总和"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -653,12 +869,24 @@
       "value": "团队成员"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "团队所有者"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -713,12 +941,42 @@
       "value": "切换图表"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "总数"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "总记录数"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "跟踪代码"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "是"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "类型"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -731,6 +989,12 @@
       "value": "未知"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "未命名"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -761,6 +1025,12 @@
       "value": "用户"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "值"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -794,7 +1064,7 @@
   "label.website": [
     {
       "type": 0,
-      "value": "Website"
+      "value": "网站"
     }
   ],
   "label.website-id": [
@@ -821,168 +1091,6 @@
       "value": "昨天"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "创建报告"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "描述"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "未命名"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 0,
@@ -1128,7 +1236,7 @@
   "message.new-version-available": [
     {
       "type": 0,
-      "value": "A new version of Umami "
+      "value": "Umami的新版本"
     },
     {
       "type": 1,
@@ -1136,7 +1244,7 @@
     },
     {
       "type": 0,
-      "value": " is available!"
+      "value": "已推出！"
     }
   ],
   "message.no-data-available": [
@@ -1148,7 +1256,7 @@
   "message.no-event-data": [
     {
       "type": 0,
-      "value": "No event data is available."
+      "value": "无可用事件。"
     }
   ],
   "message.no-match-password": [
@@ -1196,7 +1304,7 @@
   "message.reset-website": [
     {
       "type": 0,
-      "value": "确定重置该网站, 请在下面的输入框中输入 "
+      "value": "如果确定重置该网站, 请在下面的输入框中输入 "
     },
     {
       "type": 1,
@@ -1260,7 +1368,7 @@
   "message.user-deleted": [
     {
       "type": 0,
-      "value": "User deleted."
+      "value": "用户已删除。"
     }
   ],
   "message.visitor-log": [
diff --git a/public/intl/messages/zh-TW.json b/public/intl/messages/zh-TW.json
index c51bd538e5..43a1996df7 100644
--- a/public/intl/messages/zh-TW.json
+++ b/public/intl/messages/zh-TW.json
@@ -41,6 +41,12 @@
       "value": "管理員"
     }
   ],
+  "label.after": [
+    {
+      "type": 0,
+      "value": "After"
+    }
+  ],
   "label.all": [
     {
       "type": 0,
@@ -59,6 +65,12 @@
       "value": "Analytics"
     }
   ],
+  "label.average": [
+    {
+      "type": 0,
+      "value": "Average"
+    }
+  ],
   "label.average-visit-time": [
     {
       "type": 0,
@@ -71,12 +83,30 @@
       "value": "返回"
     }
   ],
+  "label.before": [
+    {
+      "type": 0,
+      "value": "Before"
+    }
+  ],
   "label.bounce-rate": [
     {
       "type": 0,
       "value": "跳出率"
     }
   ],
+  "label.breakdown": [
+    {
+      "type": 0,
+      "value": "Breakdown"
+    }
+  ],
+  "label.browser": [
+    {
+      "type": 0,
+      "value": "Browser"
+    }
+  ],
   "label.browsers": [
     {
       "type": 0,
@@ -101,6 +131,12 @@
       "value": "Cities"
     }
   ],
+  "label.city": [
+    {
+      "type": 0,
+      "value": "City"
+    }
+  ],
   "label.clear-all": [
     {
       "type": 0,
@@ -119,6 +155,12 @@
       "value": "確認密碼"
     }
   ],
+  "label.contains": [
+    {
+      "type": 0,
+      "value": "Contains"
+    }
+  ],
   "label.continue": [
     {
       "type": 0,
@@ -131,6 +173,18 @@
       "value": "國家/地區"
     }
   ],
+  "label.country": [
+    {
+      "type": 0,
+      "value": "Country"
+    }
+  ],
+  "label.create-report": [
+    {
+      "type": 0,
+      "value": "Create report"
+    }
+  ],
   "label.create-team": [
     {
       "type": 0,
@@ -173,12 +227,24 @@
       "value": "Data"
     }
   ],
+  "label.date": [
+    {
+      "type": 0,
+      "value": "Date"
+    }
+  ],
   "label.date-range": [
     {
       "type": 0,
       "value": "多日"
     }
   ],
+  "label.day": [
+    {
+      "type": 0,
+      "value": "Day"
+    }
+  ],
   "label.default-date-range": [
     {
       "type": 0,
@@ -209,6 +275,12 @@
       "value": "刪除網站"
     }
   ],
+  "label.description": [
+    {
+      "type": 0,
+      "value": "Description"
+    }
+  ],
   "label.desktop": [
     {
       "type": 0,
@@ -221,6 +293,12 @@
       "value": "Details"
     }
   ],
+  "label.device": [
+    {
+      "type": 0,
+      "value": "Device"
+    }
+  ],
   "label.devices": [
     {
       "type": 0,
@@ -233,6 +311,12 @@
       "value": "關閉"
     }
   ],
+  "label.does-not-contain": [
+    {
+      "type": 0,
+      "value": "Does not contain"
+    }
+  ],
   "label.domain": [
     {
       "type": 0,
@@ -281,6 +365,12 @@
       "value": "行為類別"
     }
   ],
+  "label.false": [
+    {
+      "type": 0,
+      "value": "False"
+    }
+  ],
   "label.field": [
     {
       "type": 0,
@@ -305,18 +395,60 @@
       "value": "原始"
     }
   ],
+  "label.filters": [
+    {
+      "type": 0,
+      "value": "Filters"
+    }
+  ],
   "label.funnel": [
     {
       "type": 0,
       "value": "Funnel"
     }
   ],
+  "label.greater-than": [
+    {
+      "type": 0,
+      "value": "Greater than"
+    }
+  ],
+  "label.greater-than-equals": [
+    {
+      "type": 0,
+      "value": "Greater than or equals"
+    }
+  ],
   "label.insights": [
     {
       "type": 0,
       "value": "Insights"
     }
   ],
+  "label.is": [
+    {
+      "type": 0,
+      "value": "Is"
+    }
+  ],
+  "label.is-not": [
+    {
+      "type": 0,
+      "value": "Is not"
+    }
+  ],
+  "label.is-not-set": [
+    {
+      "type": 0,
+      "value": "Is not set"
+    }
+  ],
+  "label.is-set": [
+    {
+      "type": 0,
+      "value": "Is set"
+    }
+  ],
   "label.join": [
     {
       "type": 0,
@@ -387,6 +519,18 @@
       "value": "Leave team"
     }
   ],
+  "label.less-than": [
+    {
+      "type": 0,
+      "value": "Less than"
+    }
+  ],
+  "label.less-than-equals": [
+    {
+      "type": 0,
+      "value": "Less than or equals"
+    }
+  ],
   "label.login": [
     {
       "type": 0,
@@ -399,12 +543,24 @@
       "value": "退出"
     }
   ],
+  "label.max": [
+    {
+      "type": 0,
+      "value": "Max"
+    }
+  ],
   "label.members": [
     {
       "type": 0,
       "value": "Members"
     }
   ],
+  "label.min": [
+    {
+      "type": 0,
+      "value": "Min"
+    }
+  ],
   "label.mobile": [
     {
       "type": 0,
@@ -417,6 +573,12 @@
       "value": "更多"
     }
   ],
+  "label.my-websites": [
+    {
+      "type": 0,
+      "value": "My websites"
+    }
+  ],
   "label.name": [
     {
       "type": 0,
@@ -435,10 +597,16 @@
       "value": "無"
     }
   ],
-  "label.operating-systems": [
+  "label.os": [
     {
       "type": 0,
-      "value": "操作系統"
+      "value": "OS"
+    }
+  ],
+  "label.overview": [
+    {
+      "type": 0,
+      "value": "Overview"
     }
   ],
   "label.owner": [
@@ -447,12 +615,36 @@
       "value": "擁有者"
     }
   ],
+  "label.page-of": [
+    {
+      "type": 0,
+      "value": "Page "
+    },
+    {
+      "type": 1,
+      "value": "current"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "type": 1,
+      "value": "total"
+    }
+  ],
   "label.page-views": [
     {
       "type": 0,
       "value": "網頁流量"
     }
   ],
+  "label.pageTitle": [
+    {
+      "type": 0,
+      "value": "Page title"
+    }
+  ],
   "label.pages": [
     {
       "type": 0,
@@ -505,6 +697,12 @@
       "value": "實時"
     }
   ],
+  "label.referrer": [
+    {
+      "type": 0,
+      "value": "Referrer"
+    }
+  ],
   "label.referrers": [
     {
       "type": 0,
@@ -523,6 +721,12 @@
       "value": "Regenerate"
     }
   ],
+  "label.region": [
+    {
+      "type": 0,
+      "value": "Region"
+    }
+  ],
   "label.regions": [
     {
       "type": 0,
@@ -559,6 +763,12 @@
       "value": "重置統計數據"
     }
   ],
+  "label.retention": [
+    {
+      "type": 0,
+      "value": "Retention"
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -619,6 +829,12 @@
       "value": "單日"
     }
   ],
+  "label.sum": [
+    {
+      "type": 0,
+      "value": "Sum"
+    }
+  ],
   "label.tablet": [
     {
       "type": 0,
@@ -649,12 +865,24 @@
       "value": "Team member"
     }
   ],
+  "label.team-name": [
+    {
+      "type": 0,
+      "value": "Team name"
+    }
+  ],
   "label.team-owner": [
     {
       "type": 0,
       "value": "Team owner"
     }
   ],
+  "label.team-websites": [
+    {
+      "type": 0,
+      "value": "Team websites"
+    }
+  ],
   "label.teams": [
     {
       "type": 0,
@@ -709,12 +937,42 @@
       "value": "切換圖表"
     }
   ],
+  "label.total": [
+    {
+      "type": 0,
+      "value": "Total"
+    }
+  ],
+  "label.total-records": [
+    {
+      "type": 0,
+      "value": "Total records"
+    }
+  ],
   "label.tracking-code": [
     {
       "type": 0,
       "value": "追蹤代碼"
     }
   ],
+  "label.true": [
+    {
+      "type": 0,
+      "value": "True"
+    }
+  ],
+  "label.type": [
+    {
+      "type": 0,
+      "value": "Type"
+    }
+  ],
+  "label.unique": [
+    {
+      "type": 0,
+      "value": "Unique"
+    }
+  ],
   "label.unique-visitors": [
     {
       "type": 0,
@@ -727,6 +985,12 @@
       "value": "未知"
     }
   ],
+  "label.untitled": [
+    {
+      "type": 0,
+      "value": "Untitled"
+    }
+  ],
   "label.url": [
     {
       "type": 0,
@@ -757,6 +1021,12 @@
       "value": "Users"
     }
   ],
+  "label.value": [
+    {
+      "type": 0,
+      "value": "Value"
+    }
+  ],
   "label.view": [
     {
       "type": 0,
@@ -817,168 +1087,6 @@
       "value": "Yesterday"
     }
   ],
-  "labels.after": [
-    {
-      "type": 0,
-      "value": "After"
-    }
-  ],
-  "labels.average": [
-    {
-      "type": 0,
-      "value": "Average"
-    }
-  ],
-  "labels.before": [
-    {
-      "type": 0,
-      "value": "Before"
-    }
-  ],
-  "labels.breakdown": [
-    {
-      "type": 0,
-      "value": "Breakdown"
-    }
-  ],
-  "labels.contains": [
-    {
-      "type": 0,
-      "value": "Contains"
-    }
-  ],
-  "labels.create-report": [
-    {
-      "type": 0,
-      "value": "Create report"
-    }
-  ],
-  "labels.description": [
-    {
-      "type": 0,
-      "value": "Description"
-    }
-  ],
-  "labels.does-not-contain": [
-    {
-      "type": 0,
-      "value": "Does not contain"
-    }
-  ],
-  "labels.does-not-equal": [
-    {
-      "type": 0,
-      "value": "Does not equal"
-    }
-  ],
-  "labels.equals": [
-    {
-      "type": 0,
-      "value": "Equals"
-    }
-  ],
-  "labels.false": [
-    {
-      "type": 0,
-      "value": "False"
-    }
-  ],
-  "labels.filters": [
-    {
-      "type": 0,
-      "value": "Filters"
-    }
-  ],
-  "labels.greater-than": [
-    {
-      "type": 0,
-      "value": "Greater than"
-    }
-  ],
-  "labels.greater-than-equals": [
-    {
-      "type": 0,
-      "value": "Greater than or equals"
-    }
-  ],
-  "labels.less-than": [
-    {
-      "type": 0,
-      "value": "Less than"
-    }
-  ],
-  "labels.less-than-equals": [
-    {
-      "type": 0,
-      "value": "Less than or equals"
-    }
-  ],
-  "labels.max": [
-    {
-      "type": 0,
-      "value": "Max"
-    }
-  ],
-  "labels.min": [
-    {
-      "type": 0,
-      "value": "Min"
-    }
-  ],
-  "labels.overview": [
-    {
-      "type": 0,
-      "value": "Overview"
-    }
-  ],
-  "labels.sum": [
-    {
-      "type": 0,
-      "value": "Sum"
-    }
-  ],
-  "labels.total": [
-    {
-      "type": 0,
-      "value": "Total"
-    }
-  ],
-  "labels.total-records": [
-    {
-      "type": 0,
-      "value": "Total records"
-    }
-  ],
-  "labels.true": [
-    {
-      "type": 0,
-      "value": "True"
-    }
-  ],
-  "labels.type": [
-    {
-      "type": 0,
-      "value": "Type"
-    }
-  ],
-  "labels.unique": [
-    {
-      "type": 0,
-      "value": "Unique"
-    }
-  ],
-  "labels.untitled": [
-    {
-      "type": 0,
-      "value": "Untitled"
-    }
-  ],
-  "labels.value": [
-    {
-      "type": 0,
-      "value": "Value"
-    }
-  ],
   "message.active-users": [
     {
       "type": 0,
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
index 7f73bcd84d..ae4fd79c1c 100644
Binary files a/public/mstile-150x150.png and b/public/mstile-150x150.png differ
diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg
index 179f3e69b2..2d116eb842 100644
--- a/public/safari-pinned-tab.svg
+++ b/public/safari-pinned-tab.svg
@@ -1,75 +1 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="856.000000pt" height="856.000000pt" viewBox="0 0 856.000000 856.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.11, written by Peter Selinger 2001-2013
-</metadata>
-<g transform="translate(0.000000,856.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M4027 8163 c-2 -2 -28 -5 -58 -7 -50 -4 -94 -9 -179 -22 -19 -2 -48
--6 -65 -9 -47 -6 -236 -44 -280 -55 -22 -6 -49 -12 -60 -15 -34 -6 -58 -13
--130 -36 -38 -13 -72 -23 -75 -24 -29 -6 -194 -66 -264 -96 -49 -22 -95 -39
--102 -39 -7 0 -19 -7 -28 -15 -8 -9 -18 -15 -21 -14 -7 1 -197 -92 -205 -101
--3 -3 -21 -13 -40 -24 -79 -42 -123 -69 -226 -137 -94 -62 -246 -173 -280
--204 -6 -5 -29 -25 -52 -43 -136 -111 -329 -305 -457 -462 -21 -25 -41 -47
--44 -50 -4 -3 -22 -26 -39 -52 -18 -25 -38 -52 -45 -60 -34 -35 -207 -308
--259 -408 -13 -25 -25 -47 -28 -50 -11 -11 -121 -250 -159 -346 -42 -105 -114
--321 -126 -374 l-7 -30 -263 0 c-245 0 -268 -2 -321 -21 -94 -35 -171 -122
--191 -216 -9 -39 -8 -852 0 -938 9 -87 16 -150 23 -195 3 -19 6 -48 8 -65 3
--29 14 -97 22 -140 3 -11 7 -36 10 -55 3 -19 9 -51 14 -70 5 -19 11 -46 14
--60 29 -138 104 -401 145 -505 5 -11 23 -58 42 -105 18 -47 42 -105 52 -130
-11 -25 21 -49 22 -55 3 -10 109 -224 164 -330 18 -33 50 -89 71 -124 22 -34
-40 -64 40 -66 0 -8 104 -161 114 -167 6 -4 7 -8 3 -8 -4 0 4 -12 18 -27 14
--15 25 -32 25 -36 0 -5 6 -14 13 -21 6 -7 21 -25 32 -41 11 -15 34 -44 50 -64
-17 -21 41 -52 55 -70 13 -18 33 -43 45 -56 11 -13 42 -49 70 -81 100 -118 359
--369 483 -469 34 -27 62 -53 62 -57 0 -5 6 -8 13 -8 7 0 19 -9 27 -20 8 -11
-19 -20 26 -20 6 0 19 -9 29 -20 10 -11 22 -20 27 -20 5 0 23 -13 41 -30 18
--16 37 -30 44 -30 6 0 13 -4 15 -8 3 -8 186 -132 194 -132 2 0 27 -15 56 -34
-132 -83 377 -207 558 -280 36 -15 74 -31 85 -36 62 -26 220 -81 320 -109 79
--23 191 -53 214 -57 14 -3 28 -7 31 -9 4 -2 20 -7 36 -9 16 -3 40 -8 54 -11
-14 -3 36 -8 50 -11 14 -2 36 -7 50 -10 13 -3 40 -8 60 -10 19 -2 46 -7 60 -10
-54 -10 171 -25 320 -40 90 -9 613 -12 636 -4 11 5 28 4 37 -1 9 -6 17 -6 17
--1 0 4 10 8 23 9 29 0 154 12 192 18 17 3 46 7 65 9 70 10 131 20 183 32 16 3
-38 7 50 9 45 7 165 36 252 60 50 14 100 28 112 30 12 3 34 10 48 15 14 5 25 7
-25 4 0 -4 6 -2 13 3 6 6 30 16 52 22 22 7 47 15 55 18 8 4 17 7 20 7 10 2 179
-68 240 94 96 40 342 159 395 191 17 10 53 30 80 46 28 15 81 47 118 71 37 24
-72 44 76 44 5 0 11 3 13 8 2 4 30 25 63 47 33 22 62 42 65 45 3 3 50 38 105
-79 55 40 105 79 110 85 6 6 24 22 40 34 85 65 465 430 465 447 0 3 8 13 18 23
-9 10 35 40 57 66 22 27 47 56 55 65 8 9 42 52 74 96 32 44 71 96 85 115 140
-183 358 576 461 830 12 30 28 69 36 85 24 56 123 355 117 355 -3 0 -1 6 5 13
-6 6 14 30 18 52 10 48 9 46 17 65 5 13 37 155 52 230 9 42 35 195 40 231 34
-235 40 357 40 804 l0 420 -24 44 c-46 87 -143 157 -231 166 -19 2 -144 4 -276
-4 l-242 1 -36 118 c-21 64 -46 139 -56 166 -11 27 -20 52 -20 57 0 5 -11 33
--25 63 -14 30 -25 58 -25 61 0 18 -152 329 -162 333 -5 2 -8 10 -8 18 0 8 -4
-14 -10 14 -5 0 -9 3 -8 8 3 9 -40 82 -128 217 -63 97 -98 145 -187 259 -133
-171 -380 420 -559 564 -71 56 -132 102 -138 102 -5 0 -10 3 -10 8 0 4 -25 23
--55 42 -30 19 -55 38 -55 43 0 4 -6 7 -13 7 -7 0 -22 8 -33 18 -11 9 -37 26
--59 37 -21 11 -44 25 -50 30 -41 37 -413 220 -540 266 -27 9 -61 22 -75 27
--14 5 -28 10 -32 11 -4 1 -28 10 -53 21 -25 11 -46 19 -48 18 -2 -1 -109 29
--137 40 -13 4 -32 9 -65 16 -5 1 -16 5 -22 9 -7 5 -13 6 -13 3 0 -2 -15 0 -32
-5 -18 5 -44 11 -58 14 -14 3 -36 7 -50 10 -14 3 -50 9 -80 15 -30 6 -64 12
--75 14 -11 2 -45 6 -75 10 -30 4 -71 9 -90 12 -19 3 -53 6 -75 7 -22 1 -44 5
--50 8 -11 7 -542 9 -548 2z m57 -404 c7 10 436 8 511 -3 22 -3 60 -8 85 -11
-25 -2 56 -6 70 -9 14 -2 43 -7 65 -10 38 -5 58 -9 115 -21 14 -3 34 -7 45 -9
-11 -2 58 -14 105 -26 47 -12 92 -23 100 -25 35 -7 279 -94 308 -109 17 -9 34
--16 37 -16 3 1 20 -6 38 -14 17 -8 68 -31 112 -51 44 -20 82 -35 84 -35 2 1 7
--3 10 -8 3 -5 43 -28 88 -51 45 -23 87 -48 93 -56 7 -8 17 -15 22 -15 12 0
-192 -121 196 -132 2 -4 8 -8 13 -8 10 0 119 -86 220 -172 102 -87 256 -244
-349 -357 25 -30 53 -63 63 -73 9 -10 17 -22 17 -28 0 -5 3 -10 8 -10 4 0 25
--27 46 -60 22 -33 43 -60 48 -60 4 0 8 -5 8 -11 0 -6 11 -25 25 -43 14 -18 25
--38 25 -44 0 -7 4 -12 8 -12 5 0 16 -15 25 -32 9 -18 30 -55 47 -83 46 -77
-161 -305 154 -305 -4 0 -2 -6 4 -12 6 -7 23 -47 40 -88 16 -41 33 -84 37 -95
-5 -11 9 -22 10 -25 0 -3 11 -36 24 -73 13 -38 21 -70 19 -73 -3 -2 -1386 -3
--3075 -2 l-3071 3 38 110 c47 137 117 301 182 425 62 118 167 295 191 320 9
-11 17 22 17 25 0 7 39 63 58 83 6 7 26 35 44 60 18 26 37 52 43 57 6 6 34 37
-61 70 48 59 271 286 329 335 17 14 53 43 80 65 28 22 52 42 55 45 3 3 21 17
-40 30 19 14 40 28 45 32 40 32 105 78 109 78 3 0 28 16 55 35 26 19 53 35 58
-35 5 0 18 8 29 18 17 15 53 35 216 119 118 60 412 176 422 166 3 -4 6 -2 6 4
-0 6 12 13 28 16 15 3 52 12 82 21 30 9 63 19 73 21 10 2 27 7 37 10 10 3 29 8
-42 10 13 3 48 10 78 16 30 7 61 12 68 12 6 0 12 4 12 9 0 5 5 6 10 3 6 -4 34
--2 63 4 51 11 71 13 197 26 36 4 67 9 69 11 2 2 10 -1 17 -7 8 -6 14 -7 18 0z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="1141.333" height="1141.333" preserveAspectRatio="xMidYMid meet" version="1.0" viewBox="0 0 856 856"><metadata>Created by potrace 1.11, written by Peter Selinger 2001-2013</metadata><g fill="#000" stroke="none"><path d="M4027 8163 c-2 -2 -28 -5 -58 -7 -50 -4 -94 -9 -179 -22 -19 -2 -48 -6 -65 -9 -47 -6 -236 -44 -280 -55 -22 -6 -49 -12 -60 -15 -34 -6 -58 -13 -130 -36 -38 -13 -72 -23 -75 -24 -29 -6 -194 -66 -264 -96 -49 -22 -95 -39 -102 -39 -7 0 -19 -7 -28 -15 -8 -9 -18 -15 -21 -14 -7 1 -197 -92 -205 -101 -3 -3 -21 -13 -40 -24 -79 -42 -123 -69 -226 -137 -94 -62 -246 -173 -280 -204 -6 -5 -29 -25 -52 -43 -136 -111 -329 -305 -457 -462 -21 -25 -41 -47 -44 -50 -4 -3 -22 -26 -39 -52 -18 -25 -38 -52 -45 -60 -34 -35 -207 -308 -259 -408 -13 -25 -25 -47 -28 -50 -11 -11 -121 -250 -159 -346 -42 -105 -114 -321 -126 -374 l-7 -30 -263 0 c-245 0 -268 -2 -321 -21 -94 -35 -171 -122 -191 -216 -9 -39 -8 -852 0 -938 9 -87 16 -150 23 -195 3 -19 6 -48 8 -65 3 -29 14 -97 22 -140 3 -11 7 -36 10 -55 3 -19 9 -51 14 -70 5 -19 11 -46 14 -60 29 -138 104 -401 145 -505 5 -11 23 -58 42 -105 18 -47 42 -105 52 -130 11 -25 21 -49 22 -55 3 -10 109 -224 164 -330 18 -33 50 -89 71 -124 22 -34 40 -64 40 -66 0 -8 104 -161 114 -167 6 -4 7 -8 3 -8 -4 0 4 -12 18 -27 14 -15 25 -32 25 -36 0 -5 6 -14 13 -21 6 -7 21 -25 32 -41 11 -15 34 -44 50 -64 17 -21 41 -52 55 -70 13 -18 33 -43 45 -56 11 -13 42 -49 70 -81 100 -118 359 -369 483 -469 34 -27 62 -53 62 -57 0 -5 6 -8 13 -8 7 0 19 -9 27 -20 8 -11 19 -20 26 -20 6 0 19 -9 29 -20 10 -11 22 -20 27 -20 5 0 23 -13 41 -30 18 -16 37 -30 44 -30 6 0 13 -4 15 -8 3 -8 186 -132 194 -132 2 0 27 -15 56 -34 132 -83 377 -207 558 -280 36 -15 74 -31 85 -36 62 -26 220 -81 320 -109 79 -23 191 -53 214 -57 14 -3 28 -7 31 -9 4 -2 20 -7 36 -9 16 -3 40 -8 54 -11 14 -3 36 -8 50 -11 14 -2 36 -7 50 -10 13 -3 40 -8 60 -10 19 -2 46 -7 60 -10 54 -10 171 -25 320 -40 90 -9 613 -12 636 -4 11 5 28 4 37 -1 9 -6 17 -6 17 -1 0 4 10 8 23 9 29 0 154 12 192 18 17 3 46 7 65 9 70 10 131 20 183 32 16 3 38 7 50 9 45 7 165 36 252 60 50 14 100 28 112 30 12 3 34 10 48 15 14 5 25 7 25 4 0 -4 6 -2 13 3 6 6 30 16 52 22 22 7 47 15 55 18 8 4 17 7 20 7 10 2 179 68 240 94 96 40 342 159 395 191 17 10 53 30 80 46 28 15 81 47 118 71 37 24 72 44 76 44 5 0 11 3 13 8 2 4 30 25 63 47 33 22 62 42 65 45 3 3 50 38 105 79 55 40 105 79 110 85 6 6 24 22 40 34 85 65 465 430 465 447 0 3 8 13 18 23 9 10 35 40 57 66 22 27 47 56 55 65 8 9 42 52 74 96 32 44 71 96 85 115 140 183 358 576 461 830 12 30 28 69 36 85 24 56 123 355 117 355 -3 0 -1 6 5 13 6 6 14 30 18 52 10 48 9 46 17 65 5 13 37 155 52 230 9 42 35 195 40 231 34 235 40 357 40 804 l0 420 -24 44 c-46 87 -143 157 -231 166 -19 2 -144 4 -276 4 l-242 1 -36 118 c-21 64 -46 139 -56 166 -11 27 -20 52 -20 57 0 5 -11 33 -25 63 -14 30 -25 58 -25 61 0 18 -152 329 -162 333 -5 2 -8 10 -8 18 0 8 -4 14 -10 14 -5 0 -9 3 -8 8 3 9 -40 82 -128 217 -63 97 -98 145 -187 259 -133 171 -380 420 -559 564 -71 56 -132 102 -138 102 -5 0 -10 3 -10 8 0 4 -25 23 -55 42 -30 19 -55 38 -55 43 0 4 -6 7 -13 7 -7 0 -22 8 -33 18 -11 9 -37 26 -59 37 -21 11 -44 25 -50 30 -41 37 -413 220 -540 266 -27 9 -61 22 -75 27 -14 5 -28 10 -32 11 -4 1 -28 10 -53 21 -25 11 -46 19 -48 18 -2 -1 -109 29 -137 40 -13 4 -32 9 -65 16 -5 1 -16 5 -22 9 -7 5 -13 6 -13 3 0 -2 -15 0 -32 5 -18 5 -44 11 -58 14 -14 3 -36 7 -50 10 -14 3 -50 9 -80 15 -30 6 -64 12 -75 14 -11 2 -45 6 -75 10 -30 4 -71 9 -90 12 -19 3 -53 6 -75 7 -22 1 -44 5 -50 8 -11 7 -542 9 -548 2z m57 -404 c7 10 436 8 511 -3 22 -3 60 -8 85 -11 25 -2 56 -6 70 -9 14 -2 43 -7 65 -10 38 -5 58 -9 115 -21 14 -3 34 -7 45 -9 11 -2 58 -14 105 -26 47 -12 92 -23 100 -25 35 -7 279 -94 308 -109 17 -9 34 -16 37 -16 3 1 20 -6 38 -14 17 -8 68 -31 112 -51 44 -20 82 -35 84 -35 2 1 7 -3 10 -8 3 -5 43 -28 88 -51 45 -23 87 -48 93 -56 7 -8 17 -15 22 -15 12 0 192 -121 196 -132 2 -4 8 -8 13 -8 10 0 119 -86 220 -172 102 -87 256 -244 349 -357 25 -30 53 -63 63 -73 9 -10 17 -22 17 -28 0 -5 3 -10 8 -10 4 0 25 -27 46 -60 22 -33 43 -60 48 -60 4 0 8 -5 8 -11 0 -6 11 -25 25 -43 14 -18 25 -38 25 -44 0 -7 4 -12 8 -12 5 0 16 -15 25 -32 9 -18 30 -55 47 -83 46 -77 161 -305 154 -305 -4 0 -2 -6 4 -12 6 -7 23 -47 40 -88 16 -41 33 -84 37 -95 5 -11 9 -22 10 -25 0 -3 11 -36 24 -73 13 -38 21 -70 19 -73 -3 -2 -1386 -3 -3075 -2 l-3071 3 38 110 c47 137 117 301 182 425 62 118 167 295 191 320 9 11 17 22 17 25 0 7 39 63 58 83 6 7 26 35 44 60 18 26 37 52 43 57 6 6 34 37 61 70 48 59 271 286 329 335 17 14 53 43 80 65 28 22 52 42 55 45 3 3 21 17 40 30 19 14 40 28 45 32 40 32 105 78 109 78 3 0 28 16 55 35 26 19 53 35 58 35 5 0 18 8 29 18 17 15 53 35 216 119 118 60 412 176 422 166 3 -4 6 -2 6 4 0 6 12 13 28 16 15 3 52 12 82 21 30 9 63 19 73 21 10 2 27 7 37 10 10 3 29 8 42 10 13 3 48 10 78 16 30 7 61 12 68 12 6 0 12 4 12 9 0 5 5 6 10 3 6 -4 34 -2 63 4 51 11 71 13 197 26 36 4 67 9 69 11 2 2 10 -1 17 -7 8 -6 14 -7 18 0z" transform="translate(0.000000,856.000000) scale(0.100000,-0.100000)"/></g></svg>
\ No newline at end of file
diff --git a/queries/admin/report.ts b/queries/admin/report.ts
index ee7a059201..a053ba92dd 100644
--- a/queries/admin/report.ts
+++ b/queries/admin/report.ts
@@ -1,5 +1,7 @@
 import { Prisma, Report } from '@prisma/client';
+import { REPORT_FILTER_TYPES } from 'lib/constants';
 import prisma from 'lib/prisma';
+import { FilterResult, ReportSearchFilter } from 'lib/types';
 
 export async function createReport(data: Prisma.ReportUncheckedCreateInput): Promise<Report> {
   return prisma.client.report.create({ data });
@@ -13,22 +15,6 @@ export async function getReportById(reportId: string): Promise<Report> {
   });
 }
 
-export async function getUserReports(userId: string): Promise<Report[]> {
-  return prisma.client.report.findMany({
-    where: {
-      userId,
-    },
-  });
-}
-
-export async function getWebsiteReports(websiteId: string): Promise<Report[]> {
-  return prisma.client.report.findMany({
-    where: {
-      websiteId,
-    },
-  });
-}
-
 export async function updateReport(
   reportId: string,
   data: Prisma.ReportUpdateInput,
@@ -39,3 +25,156 @@ export async function updateReport(
 export async function deleteReport(reportId: string): Promise<Report> {
   return prisma.client.report.delete({ where: { id: reportId } });
 }
+
+export async function getReports(
+  ReportSearchFilter: ReportSearchFilter,
+  options?: { include?: Prisma.ReportInclude },
+): Promise<FilterResult<Report[]>> {
+  const {
+    userId,
+    websiteId,
+    includeTeams,
+    filter,
+    filterType = REPORT_FILTER_TYPES.all,
+  } = ReportSearchFilter;
+
+  const mode = prisma.getSearchMode();
+
+  const where: Prisma.ReportWhereInput = {
+    ...(userId && { userId: userId }),
+    ...(websiteId && { websiteId: websiteId }),
+    AND: [
+      {
+        OR: [
+          {
+            ...(userId && { userId: userId }),
+          },
+          {
+            ...(includeTeams && {
+              website: {
+                teamWebsite: {
+                  some: {
+                    team: {
+                      teamUser: {
+                        some: {
+                          userId,
+                        },
+                      },
+                    },
+                  },
+                },
+              },
+            }),
+          },
+        ],
+      },
+      {
+        OR: [
+          {
+            ...((filterType === REPORT_FILTER_TYPES.all ||
+              filterType === REPORT_FILTER_TYPES.name) && {
+              name: {
+                startsWith: filter,
+                ...mode,
+              },
+            }),
+          },
+          {
+            ...((filterType === REPORT_FILTER_TYPES.all ||
+              filterType === REPORT_FILTER_TYPES.description) && {
+              description: {
+                startsWith: filter,
+                ...mode,
+              },
+            }),
+          },
+          {
+            ...((filterType === REPORT_FILTER_TYPES.all ||
+              filterType === REPORT_FILTER_TYPES.type) && {
+              type: {
+                startsWith: filter,
+                ...mode,
+              },
+            }),
+          },
+          {
+            ...((filterType === REPORT_FILTER_TYPES.all ||
+              filterType === REPORT_FILTER_TYPES['user:username']) && {
+              user: {
+                username: {
+                  startsWith: filter,
+                  ...mode,
+                },
+              },
+            }),
+          },
+          {
+            ...((filterType === REPORT_FILTER_TYPES.all ||
+              filterType === REPORT_FILTER_TYPES['website:name']) && {
+              website: {
+                name: {
+                  startsWith: filter,
+                  ...mode,
+                },
+              },
+            }),
+          },
+          {
+            ...((filterType === REPORT_FILTER_TYPES.all ||
+              filterType === REPORT_FILTER_TYPES['website:domain']) && {
+              website: {
+                domain: {
+                  startsWith: filter,
+                  ...mode,
+                },
+              },
+            }),
+          },
+        ],
+      },
+    ],
+  };
+
+  const [pageFilters, getParameters] = prisma.getPageFilters(ReportSearchFilter);
+
+  const reports = await prisma.client.report.findMany({
+    where,
+    ...pageFilters,
+    ...(options?.include && { include: options.include }),
+  });
+  const count = await prisma.client.report.count({
+    where,
+  });
+
+  return {
+    data: reports,
+    count,
+    ...getParameters,
+  };
+}
+
+export async function getReportsByUserId(
+  userId: string,
+  filter: ReportSearchFilter,
+): Promise<FilterResult<Report[]>> {
+  return getReports(
+    { userId, ...filter },
+    {
+      include: {
+        website: {
+          select: {
+            domain: true,
+            userId: true,
+          },
+        },
+      },
+    },
+  );
+}
+
+export async function getReportsByWebsiteId(
+  websiteId: string,
+  filter: ReportSearchFilter,
+): Promise<FilterResult<Report[]>> {
+  return getReports({ websiteId, ...filter });
+}
diff --git a/queries/admin/team.ts b/queries/admin/team.ts
index a8b3385cad..284b218e25 100644
--- a/queries/admin/team.ts
+++ b/queries/admin/team.ts
@@ -1,7 +1,8 @@
 import { Prisma, Team } from '@prisma/client';
-import prisma from 'lib/prisma';
-import { ROLES } from 'lib/constants';
+import { ROLES, TEAM_FILTER_TYPES } from 'lib/constants';
 import { uuid } from 'lib/crypto';
+import prisma from 'lib/prisma';
+import { FilterResult, TeamSearchFilter } from 'lib/types';
 
 export interface GetTeamOptions {
   includeTeamUser?: boolean;
@@ -26,12 +27,6 @@ export function getTeamByAccessCode(accessCode: string, options: GetTeamOptions
   return getTeam({ accessCode }, options);
 }
 
-export async function getTeams(where: Prisma.TeamWhereInput): Promise<Team[]> {
-  return prisma.client.team.findMany({
-    where,
-  });
-}
-
 export async function createTeam(data: Prisma.TeamCreateInput, userId: string): Promise<Team> {
   const { id } = data;
 
@@ -85,3 +80,85 @@ export async function deleteTeam(
     }),
   ]);
 }
+
+export async function getTeams(
+  TeamSearchFilter: TeamSearchFilter,
+  options?: { include?: Prisma.TeamInclude },
+): Promise<FilterResult<Team[]>> {
+  const { userId, filter, filterType = TEAM_FILTER_TYPES.all } = TeamSearchFilter;
+  const mode = prisma.getSearchMode();
+
+  const where: Prisma.TeamWhereInput = {
+    ...(userId && {
+      teamUser: {
+        some: { userId },
+      },
+    }),
+    ...(filter && {
+      AND: {
+        OR: [
+          {
+            ...((filterType === TEAM_FILTER_TYPES.all || filterType === TEAM_FILTER_TYPES.name) && {
+              name: { startsWith: filter, ...mode },
+            }),
+          },
+          {
+            ...((filterType === TEAM_FILTER_TYPES.all ||
+              filterType === TEAM_FILTER_TYPES['user:username']) && {
+              teamUser: {
+                some: {
+                  role: ROLES.teamOwner,
+                  user: {
+                    username: {
+                      startsWith: filter,
+                      ...mode,
+                    },
+                  },
+                },
+              },
+            }),
+          },
+        ],
+      },
+    }),
+  };
+
+  const [pageFilters, getParameters] = prisma.getPageFilters({
+    orderBy: 'name',
+    ...TeamSearchFilter,
+  });
+
+  const teams = await prisma.client.team.findMany({
+    where: {
+      ...where,
+    },
+    ...pageFilters,
+    ...(options?.include && { include: options?.include }),
+  });
+  const count = await prisma.client.team.count({ where });
+
+  return { data: teams, count, ...getParameters };
+}
+
+export async function getTeamsByUserId(
+  userId: string,
+  filter?: TeamSearchFilter,
+): Promise<FilterResult<Team[]>> {
+  return getTeams(
+    { userId, ...filter },
+    {
+      include: {
+        teamUser: {
+          include: {
+            user: {
+              select: {
+                id: true,
+                username: true,
+              },
+            },
+          },
+        },
+      },
+    },
+  );
+}
diff --git a/queries/admin/user.ts b/queries/admin/user.ts
index f60c48010c..dfb923f316 100644
--- a/queries/admin/user.ts
+++ b/queries/admin/user.ts
@@ -1,9 +1,9 @@
-import { Prisma, Team, TeamUser } from '@prisma/client';
-import { getRandomChars } from 'next-basics';
+import { Prisma } from '@prisma/client';
 import cache from 'lib/cache';
-import { ROLES } from 'lib/constants';
+import { ROLES, USER_FILTER_TYPES } from 'lib/constants';
 import prisma from 'lib/prisma';
-import { Website, User, Role } from 'lib/types';
+import { FilterResult, Role, User, UserSearchFilter } from 'lib/types';
+import { getRandomChars } from 'next-basics';
 
 export interface GetUserOptions {
   includePassword?: boolean;
@@ -36,125 +36,62 @@ export async function getUserByUsername(username: string, options: GetUserOption
   return getUser({ username }, options);
 }
 
-export async function getUsers(): Promise<User[]> {
-  return prisma.client.user.findMany({
-    take: 100,
-    where: {
-      deletedAt: null,
-    },
-    orderBy: [
-      {
-        username: 'asc',
-      },
-    ],
-    select: {
-      id: true,
-      username: true,
-      role: true,
-      createdAt: true,
-    },
-  });
-}
+export async function getUsers(
+  UserSearchFilter: UserSearchFilter = {},
+  options?: { include?: Prisma.UserInclude },
+): Promise<FilterResult<User[]>> {
+  const { teamId, filter, filterType = USER_FILTER_TYPES.all } = UserSearchFilter;
+  const mode = prisma.getSearchMode();
 
-export async function getUserTeams(userId: string): Promise<
-  (Team & {
-    teamUser: (TeamUser & {
-      user: { id: string; username: string };
-    })[];
-  })[]
-> {
-  return prisma.client.team.findMany({
-    where: {
+  const where: Prisma.UserWhereInput = {
+    ...(teamId && {
       teamUser: {
         some: {
-          userId,
+          teamId,
         },
       },
-    },
-    include: {
-      teamUser: {
-        include: {
-          user: {
-            select: {
-              id: true,
-              username: true,
-            },
+    }),
+    ...(filter && {
+      AND: {
+        OR: [
+          {
+            ...((filterType === USER_FILTER_TYPES.all ||
+              filterType === USER_FILTER_TYPES.username) && {
+              username: {
+                startsWith: filter,
+                ...mode,
+              },
+            }),
           },
-        },
+        ],
       },
-    },
+    }),
+  };
+  const [pageFilters, getParameters] = prisma.getPageFilters({
+    orderBy: 'username',
+    ...UserSearchFilter,
   });
-}
 
-export async function getUserWebsites(
-  userId: string,
-  options?: { includeTeams: boolean },
-): Promise<Website[]> {
-  const { rawQuery } = prisma;
-
-  if (options?.includeTeams) {
-    const websites = await rawQuery(
-      `
-      select
-        website_id as "id",
-        name,
-        domain,
-        share_id as "shareId",
-        reset_at as "resetAt",
-        user_id as "userId",
-        created_at as "createdAt",
-        updated_at as "updatedAt",
-        deleted_at as "deletedAt",
-        null as "teamId",
-        null as "teamName"
-      from website
-      where user_id = {{userId::uuid}}
-        and deleted_at is null
-      union
-      select           
-        w.website_id as "id",
-        w.name,
-        w.domain,
-        w.share_id as "shareId",
-        w.reset_at as "resetAt",
-        w.user_id as "userId",
-        w.created_at as "createdAt",
-        w.updated_at as "updatedAt",
-        w.deleted_at as "deletedAt",
-        t.team_id as "teamId",
-        t.name as "teamName"
-      from website w
-      inner join team_website tw
-        on tw.website_id = w.website_id
-      inner join team t
-        on t.team_id = tw.team_id
-      inner join team_user tu 
-        on tu.team_id = tw.team_id
-      where tu.user_id = {{userId::uuid}}
-        and w.deleted_at is null
-      `,
-      { userId },
-    );
-
-    return websites.reduce((arr, item) => {
-      if (!arr.find(({ id }) => id === item.id)) {
-        return arr.concat(item);
-      }
-      return arr;
-    }, []);
-  }
-
-  return prisma.client.website.findMany({
+  const users = await prisma.client.user.findMany({
     where: {
-      userId,
+      ...where,
       deletedAt: null,
     },
-    orderBy: [
-      {
-        name: 'asc',
-      },
-    ],
+    ...pageFilters,
+    ...(options?.include && { include: options.include }),
   });
+  const count = await prisma.client.user.count({
+    where: {
+      ...where,
+      deletedAt: null,
+    },
+  });
+
+  return { data: users as any, count, ...getParameters };
+}
+
+export async function getUsersByTeamId(teamId: string, filter?: UserSearchFilter) {
+  return getUsers({ teamId, ...filter });
 }
 
 export async function createUser(data: {
diff --git a/queries/admin/website.ts b/queries/admin/website.ts
index 35f32bac22..3d0c773b66 100644
--- a/queries/admin/website.ts
+++ b/queries/admin/website.ts
@@ -1,6 +1,8 @@
 import { Prisma, Website } from '@prisma/client';
 import cache from 'lib/cache';
+import { ROLES, WEBSITE_FILTER_TYPES } from 'lib/constants';
 import prisma from 'lib/prisma';
+import { FilterResult, WebsiteSearchFilter } from 'lib/types';
 
 async function getWebsite(where: Prisma.WebsiteWhereUniqueInput): Promise<Website> {
   return prisma.client.website.findUnique({
@@ -16,11 +18,230 @@ export async function getWebsiteByShareId(shareId: string) {
   return getWebsite({ shareId });
 }
 
-export async function getWebsites(): Promise<Website[]> {
+export async function getWebsites(
+  WebsiteSearchFilter: WebsiteSearchFilter,
+  options?: { include?: Prisma.WebsiteInclude },
+): Promise<FilterResult<Website[]>> {
+  const {
+    userId,
+    teamId,
+    includeTeams,
+    onlyTeams,
+    filter,
+    filterType = WEBSITE_FILTER_TYPES.all,
+  } = WebsiteSearchFilter;
+  const mode = prisma.getSearchMode();
+
+  const where: Prisma.WebsiteWhereInput = {
+    ...(teamId && {
+      teamWebsite: {
+        some: {
+          teamId,
+        },
+      },
+    }),
+    AND: [
+      {
+        OR: [
+          {
+            ...(userId &&
+              !onlyTeams && {
+                userId,
+              }),
+          },
+          {
+            ...((includeTeams || onlyTeams) && {
+              AND: [
+                {
+                  teamWebsite: {
+                    some: {
+                      team: {
+                        teamUser: {
+                          some: {
+                            userId,
+                          },
+                        },
+                      },
+                    },
+                  },
+                },
+                {
+                  userId: {
+                    not: userId,
+                  },
+                },
+              ],
+            }),
+          },
+        ],
+      },
+      {
+        OR: [
+          {
+            ...((filterType === WEBSITE_FILTER_TYPES.all ||
+              filterType === WEBSITE_FILTER_TYPES.name) && {
+              name: { startsWith: filter, ...mode },
+            }),
+          },
+          {
+            ...((filterType === WEBSITE_FILTER_TYPES.all ||
+              filterType === WEBSITE_FILTER_TYPES.domain) && {
+              domain: { startsWith: filter, ...mode },
+            }),
+          },
+        ],
+      },
+    ],
+  };
+
+  const [pageFilters, getParameters] = prisma.getPageFilters({
+    orderBy: 'name',
+    ...WebsiteSearchFilter,
+  });
+
+  const websites = await prisma.client.website.findMany({
+    where: {
+      ...where,
+      deletedAt: null,
+    },
+    ...pageFilters,
+    ...(options?.include && { include: options.include }),
+  });
+  const count = await prisma.client.website.count({ where });
+
+  return { data: websites, count, ...getParameters };
+}
+
+export async function getWebsitesByUserId(
+  userId: string,
+  filter?: WebsiteSearchFilter,
+): Promise<FilterResult<Website[]>> {
+  return getWebsites(
+    { userId, ...filter },
+    {
+      include: {
+        teamWebsite: {
+          include: {
+            team: {
+              select: {
+                name: true,
+              },
+            },
+          },
+        },
+        user: {
+          select: {
+            username: true,
+            id: true,
+          },
+        },
+      },
+    },
+  );
+}
+
+export async function getWebsitesByTeamId(
+  teamId: string,
+  filter?: WebsiteSearchFilter,
+): Promise<FilterResult<Website[]>> {
+  return getWebsites(
+    {
+      teamId,
+      ...filter,
+      includeTeams: true,
+    },
+    {
+      include: {
+        teamWebsite: {
+          include: {
+            team: {
+              include: {
+                teamUser: {
+                  where: { role: ROLES.teamOwner },
+                },
+              },
+            },
+          },
+        },
+        user: {
+          select: {
+            id: true,
+            username: true,
+          },
+        },
+      },
+    },
+  );
+}
+
+export async function getUserWebsites(
+  userId: string,
+  options?: { includeTeams: boolean },
+): Promise<Website[]> {
+  const { rawQuery } = prisma;
+
+  if (options?.includeTeams) {
+    const websites = await rawQuery(
+      `
+      select
+        website_id as "id",
+        name,
+        domain,
+        share_id as "shareId",
+        reset_at as "resetAt",
+        user_id as "userId",
+        created_at as "createdAt",
+        updated_at as "updatedAt",
+        deleted_at as "deletedAt",
+        null as "teamId",
+        null as "teamName"
+      from website
+      where user_id = {{userId::uuid}}
+        and deleted_at is null
+      union
+      select           
+        w.website_id as "id",
+        w.name,
+        w.domain,
+        w.share_id as "shareId",
+        w.reset_at as "resetAt",
+        w.user_id as "userId",
+        w.created_at as "createdAt",
+        w.updated_at as "updatedAt",
+        w.deleted_at as "deletedAt",
+        t.team_id as "teamId",
+        t.name as "teamName"
+      from website w
+      inner join team_website tw
+        on tw.website_id = w.website_id
+      inner join team t
+        on t.team_id = tw.team_id
+      inner join team_user tu 
+        on tu.team_id = tw.team_id
+      where tu.user_id = {{userId::uuid}}
+        and w.deleted_at is null
+      `,
+      { userId },
+    );
+
+    return websites.reduce((arr, item) => {
+      if (!arr.find(({ id }) => id === item.id)) {
+        return arr.concat(item);
+      }
+      return arr;
+    }, []);
+  }
+
   return prisma.client.website.findMany({
-    orderBy: {
-      name: 'asc',
+    where: {
+      userId,
+      deletedAt: null,
     },
+    orderBy: [
+      {
+        name: 'asc',
+      },
+    ],
   });
 }
 
diff --git a/queries/analytics/eventData/getEventDataEvents.ts b/queries/analytics/eventData/getEventDataEvents.ts
index 634a28a26a..2c8cb0e0da 100644
--- a/queries/analytics/eventData/getEventDataEvents.ts
+++ b/queries/analytics/eventData/getEventDataEvents.ts
@@ -1,93 +1,77 @@
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
-import { WebsiteEventDataFields } from 'lib/types';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
+import { QueryFilters, WebsiteEventData } from 'lib/types';
 
 export async function getEventDataEvents(
-  ...args: [
-    websiteId: string,
-    startDate: Date,
-    endDate: Date,
-    filters: { field?: string; event?: string },
-  ]
-): Promise<WebsiteEventDataFields[]> {
+  ...args: [websiteId: string, filters: QueryFilters]
+): Promise<WebsiteEventData[]> {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(
-  websiteId: string,
-  startDate: Date,
-  endDate: Date,
-  filters: { field?: string; event?: string },
-) {
-  const { rawQuery } = prisma;
-  const website = await loadWebsite(websiteId);
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { rawQuery, parseFilters } = prisma;
   const { event } = filters;
+  const { params } = await parseFilters(websiteId, filters);
 
   if (event) {
     return rawQuery(
       `
       select
-        we.event_name as event,
-        ed.event_key as field,
-        ed.data_type as type,
-        ed.string_value as value,
-        count(*) as total
-      from event_data as ed
-      inner join website_event as we
-        on we.event_id = ed.website_event_id
-      where ed.website_id = {{websiteId::uuid}}
-        and ed.created_at between {{startDate}} and {{endDate}}
-        and we.event_name = {{event}}
-      group by we.event_name, ed.event_key, ed.data_type, ed.string_value
+        website_event.event_name as "eventName",
+        event_data.event_key as "fieldName",
+        event_data.data_type as "dataType",
+        event_data.string_value as "fieldValue",
+        count(*) as "total"
+      from event_data
+      inner join website_event
+        on website_event.event_id = event_data.website_event_id
+      where event_data.website_id = {{websiteId::uuid}}
+        and event_data.created_at between {{startDate}} and {{endDate}}
+        and website_event.event_name = {{event}}
+      group by website_event.event_name, event_data.event_key, event_data.data_type, event_data.string_value
       order by 1 asc, 2 asc, 3 asc, 4 desc
       `,
-      { websiteId, startDate: maxDate(startDate, website.resetAt), endDate, ...filters },
+      params,
     );
   }
+
   return rawQuery(
     `
     select
-      we.event_name as event,
-      ed.event_key as field,
-      ed.data_type as type,
-      count(*) as total
-    from event_data as ed
-    inner join website_event as we
-      on we.event_id = ed.website_event_id
-    where ed.website_id = {{websiteId::uuid}}
-      and ed.created_at between {{startDate}} and {{endDate}}
-    group by we.event_name, ed.event_key, ed.data_type
+      website_event.event_name as "eventName",
+      event_data.event_key as "fieldName",
+      event_data.data_type as "dataType",
+      count(*) as "total"
+    from event_data
+    inner join website_event
+      on website_event.event_id = event_data.website_event_id
+    where event_data.website_id = {{websiteId::uuid}}
+      and event_data.created_at between {{startDate}} and {{endDate}}
+    group by website_event.event_name, event_data.event_key, event_data.data_type
     order by 1 asc, 2 asc
     limit 100
     `,
-    { websiteId, startDate: maxDate(startDate, website.resetAt), endDate },
+    params,
   );
 }
 
-async function clickhouseQuery(
-  websiteId: string,
-  startDate: Date,
-  endDate: Date,
-  filters: { field?: string; event?: string },
-) {
-  const { rawQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
+  const { rawQuery, parseFilters } = clickhouse;
   const { event } = filters;
+  const { params } = await parseFilters(websiteId, filters);
 
   if (event) {
     return rawQuery(
       `
       select
-        event_name as event,
-        event_key as field,
-        data_type as type,
-        string_value as value,
+        event_name as eventName,
+        event_key as fieldName,
+        data_type as dataType,
+        string_value as fieldValue,
         count(*) as total
       from event_data
       where website_id = {websiteId:UUID}
@@ -97,16 +81,16 @@ async function clickhouseQuery(
       order by 1 asc, 2 asc, 3 asc, 4 desc
       limit 100
       `,
-      { ...filters, websiteId, startDate: maxDate(startDate, website.resetAt), endDate },
+      params,
     );
   }
 
   return rawQuery(
     `
     select
-      event_name as event,
-      event_key as field,
-      data_type as type,
+      event_name as eventName,
+      event_key as fieldName,
+      data_type as dataType,
       count(*) as total
     from event_data
     where website_id = {websiteId:UUID}
@@ -115,6 +99,6 @@ async function clickhouseQuery(
     order by 1 asc, 2 asc
     limit 100
     `,
-    { websiteId, startDate: maxDate(startDate, website.resetAt), endDate },
+    params,
   );
 }
diff --git a/queries/analytics/eventData/getEventDataFields.ts b/queries/analytics/eventData/getEventDataFields.ts
index 516c58d0c2..ac32b188f5 100644
--- a/queries/analytics/eventData/getEventDataFields.ts
+++ b/queries/analytics/eventData/getEventDataFields.ts
@@ -1,95 +1,63 @@
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
-import { WebsiteEventDataFields } from 'lib/types';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
+import { QueryFilters, WebsiteEventData } from 'lib/types';
 
 export async function getEventDataFields(
-  ...args: [websiteId: string, startDate: Date, endDate: Date, field?: string]
-): Promise<WebsiteEventDataFields[]> {
+  ...args: [websiteId: string, filters: QueryFilters & { field?: string }]
+): Promise<WebsiteEventData[]> {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId: string, startDate: Date, endDate: Date, field: string) {
-  const { rawQuery } = prisma;
-  const website = await loadWebsite(websiteId);
-
-  if (field) {
-    return rawQuery(
-      `
-      select
-        event_key as field,
-        string_value as value,
-        count(*) as total
-      from event_data
-      where website_id = {{websiteId::uuid}}
-        and event_key = {{field}}
-        and created_at between {{startDate}} and {{endDate}}
-      group by event_key, string_value
-      order by 3 desc, 2 desc, 1 asc
-      limit 100
-      `,
-      { websiteId, field, startDate: maxDate(startDate, website.resetAt), endDate },
-    );
-  }
+async function relationalQuery(websiteId: string, filters: QueryFilters & { field?: string }) {
+  const { rawQuery, parseFilters } = prisma;
+  const { filterQuery, params } = await parseFilters(websiteId, filters, {
+    columns: { field: 'event_key' },
+  });
 
   return rawQuery(
     `
     select
-      event_key as field,
-      data_type as type,
-      count(*) as total
+      event_key as "fieldName",
+      data_type as "dataType",
+      string_value as "fieldValue",
+      count(*) as "total"
     from event_data
     where website_id = {{websiteId::uuid}}
       and created_at between {{startDate}} and {{endDate}}
-    group by event_key, data_type
-    order by 3 desc, 2 asc, 1 asc
+    ${filterQuery}
+    group by event_key, data_type, string_value
+    order by 3 desc, 2 desc, 1 asc
     limit 100
     `,
-    { websiteId, startDate: maxDate(startDate, website.resetAt), endDate },
+    params,
   );
 }
 
-async function clickhouseQuery(websiteId: string, startDate: Date, endDate: Date, field: string) {
-  const { rawQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
-
-  if (field) {
-    return rawQuery(
-      `
-      select
-        event_key as field,
-        string_value as value,
-        count(*) as total
-      from event_data
-      where website_id = {websiteId:UUID}
-        and event_key = {field:String}
-        and created_at between {startDate:DateTime} and {endDate:DateTime}
-      group by event_key, string_value
-      order by 3 desc, 2 desc, 1 asc
-      limit 100
-      `,
-      { websiteId, field, startDate: maxDate(startDate, website.resetAt), endDate },
-    );
-  }
+async function clickhouseQuery(websiteId: string, filters: QueryFilters & { field?: string }) {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, filters, {
+    columns: { field: 'event_key' },
+  });
 
   return rawQuery(
     `
     select
-      event_key as field,
-      data_type as type,
+      event_key as fieldName,
+      data_type as dataType,
+      string_value as fieldValue,
       count(*) as total
     from event_data
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime} and {endDate:DateTime}
-    group by event_key, data_type
-    order by 3 desc, 2 asc, 1 asc
+    ${filterQuery}
+    group by event_key, data_type, string_value
+    order by 3 desc, 2 desc, 1 asc
     limit 100
     `,
-    { websiteId, startDate: maxDate(startDate, website.resetAt), endDate },
+    params,
   );
 }
diff --git a/queries/analytics/eventData/getEventDataStats.ts b/queries/analytics/eventData/getEventDataStats.ts
new file mode 100644
index 0000000000..cf77ff89a0
--- /dev/null
+++ b/queries/analytics/eventData/getEventDataStats.ts
@@ -0,0 +1,69 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import { QueryFilters } from 'lib/types';
+
+export async function getEventDataStats(
+  ...args: [websiteId: string, filters: QueryFilters]
+): Promise<{
+  events: number;
+  fields: number;
+  records: number;
+}> {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  }).then(results => results[0]);
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { rawQuery, parseFilters } = prisma;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select 
+      count(distinct t.website_event_id) as "events",
+      count(distinct t.event_key) as "fields",
+      sum(t.total) as "records"
+    from (
+      select
+        website_event_id,
+        event_key,
+        count(*) as "total"
+      from event_data
+      where website_id = {{websiteId::uuid}}
+        and created_at between {{startDate}} and {{endDate}}
+      ${filterQuery}
+      group by website_event_id, event_key
+      ) as t
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
+  const { rawQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, filters);
+
+  return rawQuery(
+    `
+    select 
+      count(distinct t.event_id) as "events",
+      count(distinct t.event_key) as "fields",
+      sum(t.total) as "records"
+    from (
+      select
+        event_id,
+        event_key,
+        count(*) as "total"
+      from event_data
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime} and {endDate:DateTime}
+      ${filterQuery}
+      group by event_id, event_key
+      ) as t
+    `,
+    params,
+  );
+}
diff --git a/queries/analytics/events/getEventMetrics.ts b/queries/analytics/events/getEventMetrics.ts
index e975403665..778cfee1bd 100644
--- a/queries/analytics/events/getEventMetrics.ts
+++ b/queries/analytics/events/getEventMetrics.ts
@@ -1,24 +1,11 @@
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
-import { WebsiteEventMetric } from 'lib/types';
+import { WebsiteEventMetric, QueryFilters } from 'lib/types';
 import { EVENT_TYPE } from 'lib/constants';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
-
-export interface GetEventMetricsCriteria {
-  startDate: Date;
-  endDate: Date;
-  timezone: string;
-  unit: string;
-  filters: {
-    url: string;
-    eventName: string;
-  };
-}
 
 export async function getEventMetrics(
-  ...args: [websiteId: string, criteria: GetEventMetricsCriteria]
+  ...args: [websiteId: string, filters: QueryFilters]
 ): Promise<WebsiteEventMetric[]> {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -26,11 +13,13 @@ export async function getEventMetrics(
   });
 }
 
-async function relationalQuery(websiteId: string, criteria: GetEventMetricsCriteria) {
-  const { startDate, endDate, timezone = 'utc', unit = 'day', filters } = criteria;
-  const { rawQuery, getDateQuery, getFilterQuery } = prisma;
-  const website = await loadWebsite(websiteId);
-  const filterQuery = getFilterQuery(filters);
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { timezone = 'utc', unit = 'day' } = filters;
+  const { rawQuery, getDateQuery, parseFilters } = prisma;
+  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.customEvent,
+  });
 
   return rawQuery(
     `
@@ -39,6 +28,7 @@ async function relationalQuery(websiteId: string, criteria: GetEventMetricsCrite
       ${getDateQuery('created_at', unit, timezone)} t,
       count(*) y
     from website_event
+    ${joinSession}
     where website_id = {{websiteId::uuid}}
       and created_at between {{startDate}} and {{endDate}}
       and event_type = {{eventType}}
@@ -46,21 +36,17 @@ async function relationalQuery(websiteId: string, criteria: GetEventMetricsCrite
     group by 1, 2
     order by 2
     `,
-    {
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.customEvent,
-      ...filters,
-    },
+    params,
   );
 }
 
-async function clickhouseQuery(websiteId: string, criteria: GetEventMetricsCriteria) {
-  const { startDate, endDate, timezone = 'utc', unit = 'day', filters } = criteria;
-  const { rawQuery, getDateQuery, getFilterQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
-  const filterQuery = getFilterQuery(filters);
+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
+  const { timezone = 'UTC', unit = 'day' } = filters;
+  const { rawQuery, getDateQuery, parseFilters } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.customEvent,
+  });
 
   return rawQuery(
     `
@@ -76,12 +62,6 @@ async function clickhouseQuery(websiteId: string, criteria: GetEventMetricsCrite
     group by x, t
     order by t
     `,
-    {
-      ...filters,
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.customEvent,
-    },
+    params,
   );
 }
diff --git a/queries/analytics/stats/getActiveVisitors.ts b/queries/analytics/getActiveVisitors.ts
similarity index 84%
rename from queries/analytics/stats/getActiveVisitors.ts
rename to queries/analytics/getActiveVisitors.ts
index 8dcfd7c92b..db3583eb67 100644
--- a/queries/analytics/stats/getActiveVisitors.ts
+++ b/queries/analytics/getActiveVisitors.ts
@@ -17,10 +17,8 @@ async function relationalQuery(websiteId: string) {
     `
     select count(distinct session_id) x
     from website_event
-    join website 
-        on website_event.website_id = website.website_id
-    where website.website_id = {{websiteId::uuid}}
-    and website_event.created_at >= {{startAt}}
+    where website_id = {{websiteId::uuid}}
+    and created_at >= {{startAt}}
     `,
     { websiteId, startAt: subMinutes(new Date(), 5) },
   );
diff --git a/queries/analytics/stats/getRealtimeData.ts b/queries/analytics/getRealtimeData.ts
similarity index 93%
rename from queries/analytics/stats/getRealtimeData.ts
rename to queries/analytics/getRealtimeData.ts
index 98a5595b9d..8786ab132a 100644
--- a/queries/analytics/stats/getRealtimeData.ts
+++ b/queries/analytics/getRealtimeData.ts
@@ -1,5 +1,5 @@
 import { md5 } from 'next-basics';
-import { getSessions, getEvents } from 'queries';
+import { getSessions, getEvents } from 'queries/index';
 import { EVENT_TYPE } from 'lib/constants';
 
 export async function getRealtimeData(websiteId, time) {
diff --git a/queries/analytics/getValues.ts b/queries/analytics/getValues.ts
new file mode 100644
index 0000000000..1f088e3be0
--- /dev/null
+++ b/queries/analytics/getValues.ts
@@ -0,0 +1,38 @@
+import prisma from 'lib/prisma';
+import clickhouse from 'lib/clickhouse';
+import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
+
+export async function getValues(...args: [websiteId: string, column: string]) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, column: string) {
+  const { rawQuery } = prisma;
+
+  return rawQuery(
+    `
+    select distinct ${column} as "value"
+    from website_event
+    inner join session
+      on session.session_id = website_event.session_id
+    where website_event.website_id = {{websiteId::uuid}}
+    `,
+    { websiteId },
+  );
+}
+
+async function clickhouseQuery(websiteId: string, column: string) {
+  const { rawQuery } = clickhouse;
+
+  return rawQuery(
+    `
+    select distinct ${column} as value
+    from website_event
+    where website_id = {websiteId:UUID}
+    `,
+    { websiteId },
+  );
+}
diff --git a/queries/analytics/stats/getWebsiteDateRange.ts b/queries/analytics/getWebsiteDateRange.ts
similarity index 70%
rename from queries/analytics/stats/getWebsiteDateRange.ts
rename to queries/analytics/getWebsiteDateRange.ts
index 45885e45c6..4fb24733a2 100644
--- a/queries/analytics/stats/getWebsiteDateRange.ts
+++ b/queries/analytics/getWebsiteDateRange.ts
@@ -1,9 +1,7 @@
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
-import { loadWebsite } from 'lib/load';
 import { DEFAULT_RESET_DATE } from 'lib/constants';
-import { maxDate } from 'lib/date';
 
 export async function getWebsiteDateRange(...args: [websiteId: string]) {
   return runQuery({
@@ -13,8 +11,8 @@ export async function getWebsiteDateRange(...args: [websiteId: string]) {
 }
 
 async function relationalQuery(websiteId: string) {
-  const { rawQuery } = prisma;
-  const website = await loadWebsite(websiteId);
+  const { rawQuery, parseFilters } = prisma;
+  const { params } = await parseFilters(websiteId, { startDate: new Date(DEFAULT_RESET_DATE) });
 
   const result = await rawQuery(
     `
@@ -25,15 +23,15 @@ async function relationalQuery(websiteId: string) {
     where website_id = {{websiteId::uuid}}
       and created_at >= {{startDate}}
     `,
-    { websiteId, startDate: maxDate(new Date(DEFAULT_RESET_DATE), new Date(website.resetAt)) },
+    params,
   );
 
   return result[0] ?? null;
 }
 
 async function clickhouseQuery(websiteId: string) {
-  const { rawQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
+  const { rawQuery, parseFilters } = clickhouse;
+  const { params } = await parseFilters(websiteId, { startDate: new Date(DEFAULT_RESET_DATE) });
 
   const result = await rawQuery(
     `
@@ -44,7 +42,7 @@ async function clickhouseQuery(websiteId: string) {
     where website_id = {websiteId:UUID}
       and created_at >= {startDate:DateTime}
     `,
-    { websiteId, startDate: maxDate(new Date(DEFAULT_RESET_DATE), new Date(website.resetAt)) },
+    params,
   );
 
   return result[0] ?? null;
diff --git a/queries/analytics/stats/getWebsiteStats.ts b/queries/analytics/getWebsiteStats.ts
similarity index 60%
rename from queries/analytics/stats/getWebsiteStats.ts
rename to queries/analytics/getWebsiteStats.ts
index 4d3730ee47..1651951199 100644
--- a/queries/analytics/stats/getWebsiteStats.ts
+++ b/queries/analytics/getWebsiteStats.ts
@@ -2,29 +2,21 @@ import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
 import { EVENT_TYPE } from 'lib/constants';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
+import { QueryFilters } from 'lib/types';
 
-export async function getWebsiteStats(
-  ...args: [
-    websiteId: string,
-    data: { startDate: Date; endDate: Date; type?: string; filters: object },
-  ]
-) {
+export async function getWebsiteStats(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(
-  websiteId: string,
-  criteria: { startDate: Date; endDate: Date; filters: object },
-) {
-  const { startDate, endDate, filters = {} } = criteria;
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
   const { getDateQuery, getTimestampIntervalQuery, parseFilters, rawQuery } = prisma;
-  const website = await loadWebsite(websiteId);
-  const { filterQuery, joinSession } = parseFilters(filters);
+  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
 
   return rawQuery(
     `
@@ -43,31 +35,23 @@ async function relationalQuery(
       join website 
         on website_event.website_id = website.website_id
         ${joinSession}
-      where event_type = {{eventType}}
-        and website.website_id = {{websiteId::uuid}}
+      where website.website_id = {{websiteId::uuid}}
         and website_event.created_at between {{startDate}} and {{endDate}}
+        and event_type = {{eventType}}
         ${filterQuery}
       group by 1, 2
     ) as t
     `,
-    {
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.pageView,
-      ...filters,
-    },
+    params,
   );
 }
 
-async function clickhouseQuery(
-  websiteId: string,
-  criteria: { startDate: Date; endDate: Date; filters: object },
-) {
-  const { startDate, endDate, filters = {} } = criteria;
+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
   const { rawQuery, getDateQuery, parseFilters } = clickhouse;
-  const website = await loadWebsite(websiteId);
-  const { filterQuery } = parseFilters(filters);
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
 
   return rawQuery(
     `
@@ -91,12 +75,6 @@ async function clickhouseQuery(
       group by session_id, time_series
     ) as t;
     `,
-    {
-      ...filters,
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.pageView,
-    },
+    params,
   );
 }
diff --git a/queries/analytics/pageviews/getPageviewMetrics.ts b/queries/analytics/pageviews/getPageviewMetrics.ts
index 1032540b80..b365d3f6be 100644
--- a/queries/analytics/pageviews/getPageviewMetrics.ts
+++ b/queries/analytics/pageviews/getPageviewMetrics.ts
@@ -1,20 +1,11 @@
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
-import { EVENT_TYPE } from 'lib/constants';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
+import { EVENT_TYPE, SESSION_COLUMNS } from 'lib/constants';
+import { QueryFilters } from 'lib/types';
 
 export async function getPageviewMetrics(
-  ...args: [
-    websiteId: string,
-    criteria: {
-      startDate: Date;
-      endDate: Date;
-      column: string;
-      filters: object;
-    },
-  ]
+  ...args: [websiteId: string, columns: string, filters: QueryFilters]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -22,46 +13,25 @@ export async function getPageviewMetrics(
   });
 }
 
-async function relationalQuery(
-  websiteId: string,
-  criteria: {
-    startDate: Date;
-    endDate: Date;
-    column: string;
-    filters: object;
-  },
-) {
-  const { startDate, endDate, filters = {}, column } = criteria;
+async function relationalQuery(websiteId: string, column: string, filters: QueryFilters) {
   const { rawQuery, parseFilters } = prisma;
-  const website = await loadWebsite(websiteId);
-  const params: any = {
+  const { filterQuery, joinSession, params } = await parseFilters(
     websiteId,
-    startDate: maxDate(startDate, website.resetAt),
-    endDate,
-    eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
-    ...filters,
-  };
-
-  let excludeDomain = '';
-
-  if (column === 'referrer_domain') {
-    excludeDomain =
-      'and (website_event.referrer_domain != {{domain}} or website_event.referrer_domain is null)';
-
-    params.domain = website.domain;
-  }
-
-  const { filterQuery, joinSession } = parseFilters(filters);
+    {
+      ...filters,
+      eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
+    },
+    { joinSession: SESSION_COLUMNS.includes(column) },
+  );
 
   return rawQuery(
     `
     select ${column} x, count(*) y
     from website_event
-      ${joinSession}
+    ${joinSession}
     where website_event.website_id = {{websiteId::uuid}}
       and website_event.created_at between {{startDate}} and {{endDate}}
       and event_type = {{eventType}}
-      ${excludeDomain}
       ${filterQuery}
     group by 1
     order by 2 desc
@@ -71,34 +41,12 @@ async function relationalQuery(
   );
 }
 
-async function clickhouseQuery(
-  websiteId: string,
-  criteria: {
-    startDate: Date;
-    endDate: Date;
-    column: string;
-    filters: object;
-  },
-) {
-  const { startDate, endDate, filters = {}, column } = criteria;
+async function clickhouseQuery(websiteId: string, column: string, filters: QueryFilters) {
   const { rawQuery, parseFilters } = clickhouse;
-  const website = await loadWebsite(websiteId);
-  const params = {
-    websiteId,
-    startDate: maxDate(startDate, website.resetAt),
-    endDate,
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
     eventType: column === 'event_name' ? EVENT_TYPE.customEvent : EVENT_TYPE.pageView,
-    domain: undefined,
-  };
-
-  let excludeDomain = '';
-
-  if (column === 'referrer_domain') {
-    excludeDomain = 'and referrer_domain != {domain:String}';
-    params.domain = website.domain;
-  }
-
-  const { filterQuery } = parseFilters(filters, params);
+  });
 
   return rawQuery(
     `
@@ -107,7 +55,6 @@ async function clickhouseQuery(
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime} and {endDate:DateTime}
       and event_type = {eventType:UInt32}
-      ${excludeDomain}
       ${filterQuery}
     group by x
     order by y desc
diff --git a/queries/analytics/pageviews/getPageviewStats.ts b/queries/analytics/pageviews/getPageviewStats.ts
index f6d4158c9b..d6a980ef7a 100644
--- a/queries/analytics/pageviews/getPageviewStats.ts
+++ b/queries/analytics/pageviews/getPageviewStats.ts
@@ -2,47 +2,28 @@ import clickhouse from 'lib/clickhouse';
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import { EVENT_TYPE } from 'lib/constants';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
+import { QueryFilters } from 'lib/types';
 
-export interface PageviewStatsCriteria {
-  startDate: Date;
-  endDate: Date;
-  timezone?: string;
-  unit?: string;
-  count?: string;
-  filters: object;
-  sessionKey?: string;
-}
-
-export async function getPageviewStats(
-  ...args: [websiteId: string, criteria: PageviewStatsCriteria]
-) {
+export async function getPageviewStats(...args: [websiteId: string, filters: QueryFilters]) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
   });
 }
 
-async function relationalQuery(websiteId: string, criteria: PageviewStatsCriteria) {
-  const {
-    startDate,
-    endDate,
-    timezone = 'utc',
-    unit = 'day',
-    count = '*',
-    filters = {},
-    sessionKey = 'session_id',
-  } = criteria;
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { timezone = 'utc', unit = 'day' } = filters;
   const { getDateQuery, parseFilters, rawQuery } = prisma;
-  const website = await loadWebsite(websiteId);
-  const { filterQuery, joinSession } = parseFilters(filters);
+  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
 
   return rawQuery(
     `
     select
       ${getDateQuery('website_event.created_at', unit, timezone)} x,
-      count(${count !== '*' ? `${count}${sessionKey}` : count}) y
+      count(*) y
     from website_event
       ${joinSession}
     where website_event.website_id = {{websiteId::uuid}}
@@ -51,28 +32,17 @@ async function relationalQuery(websiteId: string, criteria: PageviewStatsCriteri
       ${filterQuery}
     group by 1
     `,
-    {
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.pageView,
-      ...filters,
-    },
+    params,
   );
 }
 
-async function clickhouseQuery(websiteId: string, criteria: PageviewStatsCriteria) {
-  const {
-    startDate,
-    endDate,
-    timezone = 'UTC',
-    unit = 'day',
-    count = '*',
-    filters = {},
-  } = criteria;
+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
+  const { timezone = 'UTC', unit = 'day' } = filters;
   const { parseFilters, rawQuery, getDateStringQuery, getDateQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
-  const { filterQuery } = parseFilters(filters);
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
 
   return rawQuery(
     `
@@ -82,7 +52,7 @@ async function clickhouseQuery(websiteId: string, criteria: PageviewStatsCriteri
     from (
       select 
         ${getDateQuery('created_at', unit, timezone)} as t,
-        count(${count !== '*' ? 'distinct session_id' : count}) as y
+        count(*) as y
       from website_event
       where website_id = {websiteId:UUID}
         and created_at between {startDate:DateTime} and {endDate:DateTime}
@@ -92,12 +62,6 @@ async function clickhouseQuery(websiteId: string, criteria: PageviewStatsCriteri
     ) as g
     order by t
     `,
-    {
-      ...filters,
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.pageView,
-    },
+    params,
   );
 }
diff --git a/queries/analytics/reports/getFunnel.ts b/queries/analytics/reports/getFunnel.ts
index 3c5c65e09c..1bbbc8782b 100644
--- a/queries/analytics/reports/getFunnel.ts
+++ b/queries/analytics/reports/getFunnel.ts
@@ -57,12 +57,14 @@ async function relationalQuery(
             from level${i} l
             join website_event we
                 on l.session_id = we.session_id
-            where we.created_at between l.created_at 
-                and ${getAddMinutesQuery(`l.created_at `, windowMinutes)}
+            where we.website_id = {{websiteId::uuid}}
+                and we.created_at between l.created_at and ${getAddMinutesQuery(
+                  `l.created_at `,
+                  windowMinutes,
+                )}
                 and we.referrer_path = {{${i - 1}}}
                 and we.url_path = {{${i}}}
                 and we.created_at <= {{endDate}}
-                and we.website_id = {{websiteId::uuid}}
           )`;
         }
 
diff --git a/queries/analytics/reports/getInsights.ts b/queries/analytics/reports/getInsights.ts
index 1d8970ed03..fa54488b63 100644
--- a/queries/analytics/reports/getInsights.ts
+++ b/queries/analytics/reports/getInsights.ts
@@ -1,16 +1,12 @@
 import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
+import { EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from 'lib/constants';
+import { QueryFilters } from 'lib/types';
 
-export interface GetInsightsCriteria {
-  startDate: Date;
-  endDate: Date;
-  fields: string[];
-  filters: string[];
-  groups: string[];
-}
-
-export async function getInsights(...args: [websiteId: string, criteria: GetInsightsCriteria]) {
+export async function getInsights(
+  ...args: [websiteId: string, fields: { name: string; type?: string }[], filters: QueryFilters]
+) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
     [CLICKHOUSE]: () => clickhouseQuery(...args),
@@ -19,24 +15,93 @@ export async function getInsights(...args: [websiteId: string, criteria: GetInsi
 
 async function relationalQuery(
   websiteId: string,
-  criteria: GetInsightsCriteria,
+  fields: { name: string; type?: string }[],
+  filters: QueryFilters,
 ): Promise<
   {
     x: string;
     y: number;
   }[]
 > {
-  return null;
+  const { parseFilters, rawQuery } = prisma;
+  const { filterQuery, joinSession, params } = await parseFilters(
+    websiteId,
+    {
+      ...filters,
+      eventType: EVENT_TYPE.pageView,
+    },
+    {
+      joinSession: !!fields.find(({ name }) => SESSION_COLUMNS.includes(name)),
+    },
+  );
+
+  return rawQuery(
+    `
+    select 
+      ${parseFields(fields)}
+    from website_event
+      ${joinSession}
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and website_event.event_type = {{eventType}}
+      ${filterQuery}
+    ${parseGroupBy(fields)}
+    order by 1 desc, 2 desc
+    limit 500
+    `,
+    params,
+  );
 }
 
 async function clickhouseQuery(
   websiteId: string,
-  criteria: GetInsightsCriteria,
+  fields: { name: string; type?: string }[],
+  filters: QueryFilters,
 ): Promise<
   {
     x: string;
     y: number;
   }[]
 > {
-  return null;
+  const { parseFilters, rawQuery } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
+
+  return rawQuery(
+    `
+    select 
+      ${parseFields(fields)}
+    from website_event
+    where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime} and {endDate:DateTime}
+      and event_type = {eventType:UInt32}
+      ${filterQuery}
+    ${parseGroupBy(fields)}
+    order by 1 desc, 2 desc
+    limit 500
+    `,
+    params,
+  );
+}
+
+function parseFields(fields) {
+  const query = fields.reduce(
+    (arr, field) => {
+      const { name } = field;
+
+      return arr.concat(`${FILTER_COLUMNS[name]} as "${name}"`);
+    },
+    ['count(*) as views', 'count(distinct website_event.session_id) as visitors'],
+  );
+
+  return query.join(',\n');
+}
+
+function parseGroupBy(fields) {
+  if (!fields.length) {
+    return '';
+  }
+  return `group by ${fields.map(({ name }) => FILTER_COLUMNS[name]).join(',')}`;
 }
diff --git a/queries/analytics/reports/getRetention.ts b/queries/analytics/reports/getRetention.ts
new file mode 100644
index 0000000000..3c384b6e58
--- /dev/null
+++ b/queries/analytics/reports/getRetention.ts
@@ -0,0 +1,176 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+
+export async function getRetention(
+  ...args: [
+    websiteId: string,
+    filters: {
+      startDate: Date;
+      endDate: Date;
+      timezone: string;
+    },
+  ]
+) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(
+  websiteId: string,
+  filters: {
+    startDate: Date;
+    endDate: Date;
+    timezone: string;
+  },
+): Promise<
+  {
+    date: string;
+    day: number;
+    visitors: number;
+    returnVisitors: number;
+    percentage: number;
+  }[]
+> {
+  const { startDate, endDate, timezone = 'UTC' } = filters;
+  const { getDateQuery, getDayDiffQuery, getCastColumnQuery, rawQuery } = prisma;
+  const unit = 'day';
+
+  return rawQuery(
+    `
+    WITH cohort_items AS (
+      select session_id,
+        ${getDateQuery('created_at', unit, timezone)} as cohort_date  
+      from session 
+      where website_id = {{websiteId::uuid}}
+        and created_at between {{startDate}} and {{endDate}}
+    ),
+    user_activities AS (
+      select distinct
+        w.session_id,
+        ${getDayDiffQuery(
+          getDateQuery('created_at', unit, timezone),
+          'c.cohort_date',
+        )} as day_number
+      from website_event w
+      join cohort_items c
+      on w.session_id = c.session_id
+      where website_id = {{websiteId::uuid}}
+          and created_at between {{startDate}} and {{endDate}}
+      ),
+    cohort_size as (
+      select cohort_date,
+        count(*) as visitors
+      from cohort_items
+      group by 1
+      order by 1
+    ),
+    cohort_date as (
+      select
+        c.cohort_date,
+        a.day_number,
+        count(*) as visitors
+      from user_activities a
+      join cohort_items c
+      on a.session_id = c.session_id
+      group by 1, 2
+    )
+    select
+      c.cohort_date as date,
+      c.day_number as day,
+      s.visitors,
+      c.visitors as "returnVisitors",
+      ${getCastColumnQuery('c.visitors', 'float')} * 100 / s.visitors  as percentage
+    from cohort_date c
+    join cohort_size s
+    on c.cohort_date = s.cohort_date
+    where c.day_number <= 31
+    order by 1, 2`,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  ).then(results => {
+    return results.map(i => ({ ...i, percentage: Number(i.percentage) || 0 }));
+  });
+}
+
+async function clickhouseQuery(
+  websiteId: string,
+  filters: {
+    startDate: Date;
+    endDate: Date;
+    timezone: string;
+  },
+): Promise<
+  {
+    date: string;
+    day: number;
+    visitors: number;
+    returnVisitors: number;
+    percentage: number;
+  }[]
+> {
+  const { startDate, endDate, timezone = 'UTC' } = filters;
+  const { getDateQuery, getDateStringQuery, rawQuery } = clickhouse;
+  const unit = 'day';
+
+  return rawQuery(
+    `
+    WITH cohort_items AS (
+      select
+        min(${getDateQuery('created_at', unit, timezone)}) as cohort_date,
+        session_id
+      from website_event
+      where website_id = {websiteId:UUID}
+      and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+      group by session_id
+    ),
+    user_activities AS (
+      select distinct
+        w.session_id,
+        (${getDateQuery('created_at', unit, timezone)} - c.cohort_date) / 86400 as day_number
+      from website_event w
+      join cohort_items c
+      on w.session_id = c.session_id
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime64} and {endDate:DateTime64}
+    ),
+    cohort_size as (
+      select cohort_date,
+        count(*) as visitors
+      from cohort_items
+      group by 1
+      order by 1
+    ),
+    cohort_date as (
+      select
+        c.cohort_date,
+        a.day_number,
+        count(*) as visitors
+      from user_activities a
+      join cohort_items c
+      on a.session_id = c.session_id
+      group by 1, 2
+    )
+    select
+      ${getDateStringQuery('c.cohort_date', unit)} as date,
+      c.day_number as day,
+      s.visitors as visitors,
+      c.visitors returnVisitors,
+      c.visitors * 100 / s.visitors as percentage
+    from cohort_date c
+    join cohort_size s
+    on c.cohort_date = s.cohort_date
+    where c.day_number <= 31
+    order by 1, 2`,
+    {
+      websiteId,
+      startDate,
+      endDate,
+    },
+  );
+}
diff --git a/queries/analytics/sessions/getSessionMetrics.ts b/queries/analytics/sessions/getSessionMetrics.ts
index aec2d8f139..fb546a73a8 100644
--- a/queries/analytics/sessions/getSessionMetrics.ts
+++ b/queries/analytics/sessions/getSessionMetrics.ts
@@ -1,15 +1,11 @@
 import prisma from 'lib/prisma';
 import clickhouse from 'lib/clickhouse';
 import { runQuery, CLICKHOUSE, PRISMA } from 'lib/db';
-import { DEFAULT_RESET_DATE, EVENT_TYPE } from 'lib/constants';
-import { loadWebsite } from 'lib/load';
-import { maxDate } from 'lib/date';
+import { EVENT_TYPE, SESSION_COLUMNS } from 'lib/constants';
+import { QueryFilters } from 'lib/types';
 
 export async function getSessionMetrics(
-  ...args: [
-    websiteId: string,
-    criteria: { startDate: Date; endDate: Date; column: string; filters: object },
-  ]
+  ...args: [websiteId: string, column: string, filters: QueryFilters]
 ) {
   return runQuery({
     [PRISMA]: () => relationalQuery(...args),
@@ -17,54 +13,47 @@ export async function getSessionMetrics(
   });
 }
 
-async function relationalQuery(
-  websiteId: string,
-  criteria: { startDate: Date; endDate: Date; column: string; filters: object },
-) {
-  const website = await loadWebsite(websiteId);
-  const { startDate, endDate, column, filters = {} } = criteria;
+async function relationalQuery(websiteId: string, column: string, filters: QueryFilters) {
   const { parseFilters, rawQuery } = prisma;
-  const { filterQuery, joinSession } = parseFilters(filters);
+  const { filterQuery, joinSession, params } = await parseFilters(
+    websiteId,
+    {
+      ...filters,
+      eventType: EVENT_TYPE.pageView,
+    },
+    {
+      joinSession: SESSION_COLUMNS.includes(column),
+    },
+  );
 
   return rawQuery(
-    `select ${column} x, count(*) y
-    from session as x
-    where x.session_id in (
-      select website_event.session_id
-      from website_event
-        join website 
-          on website_event.website_id = website.website_id
-        ${joinSession}
-      where website.website_id = {{websiteId::uuid}}
-        and website_event.created_at between {{startDate}} and {{endDate}}
-      ${filterQuery}
-    )
+    `
+    select ${column} x, count(*) y
+    from website_event
+    ${joinSession}
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and website_event.event_type = {{eventType}}
+    ${filterQuery}
     group by 1
     order by 2 desc
     limit 100`,
-    {
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      ...filters,
-    },
+    params,
   );
 }
 
-async function clickhouseQuery(
-  websiteId: string,
-  data: { startDate: Date; endDate: Date; column: string; filters: object },
-) {
-  const { startDate, endDate, column, filters = {} } = data;
+async function clickhouseQuery(websiteId: string, column: string, filters: QueryFilters) {
   const { parseFilters, rawQuery } = clickhouse;
-  const website = await loadWebsite(websiteId);
-  const { filterQuery } = parseFilters(filters);
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
 
   return rawQuery(
     `
     select
       ${column} x, count(distinct session_id) y
-    from website_event as x
+    from website_event
     where website_id = {websiteId:UUID}
       and created_at between {startDate:DateTime} and {endDate:DateTime}
       and event_type = {eventType:UInt32}
@@ -73,12 +62,6 @@ async function clickhouseQuery(
     order by y desc
     limit 100
     `,
-    {
-      ...filters,
-      websiteId,
-      startDate: maxDate(startDate, website.resetAt),
-      endDate,
-      eventType: EVENT_TYPE.pageView,
-    },
+    params,
   );
 }
diff --git a/queries/analytics/sessions/getSessionStats.ts b/queries/analytics/sessions/getSessionStats.ts
new file mode 100644
index 0000000000..9ed01a5948
--- /dev/null
+++ b/queries/analytics/sessions/getSessionStats.ts
@@ -0,0 +1,67 @@
+import clickhouse from 'lib/clickhouse';
+import { CLICKHOUSE, PRISMA, runQuery } from 'lib/db';
+import prisma from 'lib/prisma';
+import { EVENT_TYPE } from 'lib/constants';
+import { QueryFilters } from 'lib/types';
+
+export async function getSessionStats(...args: [websiteId: string, filters: QueryFilters]) {
+  return runQuery({
+    [PRISMA]: () => relationalQuery(...args),
+    [CLICKHOUSE]: () => clickhouseQuery(...args),
+  });
+}
+
+async function relationalQuery(websiteId: string, filters: QueryFilters) {
+  const { timezone = 'utc', unit = 'day' } = filters;
+  const { getDateQuery, parseFilters, rawQuery } = prisma;
+  const { filterQuery, joinSession, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
+
+  return rawQuery(
+    `
+    select
+      ${getDateQuery('website_event.created_at', unit, timezone)} x,
+      count(distinct website_event.session_id) y
+    from website_event
+      ${joinSession}
+    where website_event.website_id = {{websiteId::uuid}}
+      and website_event.created_at between {{startDate}} and {{endDate}}
+      and event_type = {{eventType}}
+      ${filterQuery}
+    group by 1
+    `,
+    params,
+  );
+}
+
+async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
+  const { timezone = 'UTC', unit = 'day' } = filters;
+  const { parseFilters, rawQuery, getDateStringQuery, getDateQuery } = clickhouse;
+  const { filterQuery, params } = await parseFilters(websiteId, {
+    ...filters,
+    eventType: EVENT_TYPE.pageView,
+  });
+
+  return rawQuery(
+    `
+    select
+      ${getDateStringQuery('g.t', unit)} as x, 
+      g.y as y
+    from (
+      select 
+        ${getDateQuery('created_at', unit, timezone)} as t,
+        count(distinct session_id) as y
+      from website_event
+      where website_id = {websiteId:UUID}
+        and created_at between {startDate:DateTime} and {endDate:DateTime}
+        and event_type = {eventType:UInt32}
+        ${filterQuery}
+      group by t
+    ) as g
+    order by t
+    `,
+    params,
+  );
+}
diff --git a/queries/index.js b/queries/index.js
index f509e0392e..452d85a64d 100644
--- a/queries/index.js
+++ b/queries/index.js
@@ -9,9 +9,11 @@ export * from './analytics/events/getEventUsage';
 export * from './analytics/events/getEvents';
 export * from './analytics/eventData/getEventDataEvents';
 export * from './analytics/eventData/getEventDataFields';
+export * from './analytics/eventData/getEventDataStats';
 export * from './analytics/eventData/getEventDataUsage';
 export * from './analytics/events/saveEvent';
 export * from './analytics/reports/getFunnel';
+export * from './analytics/reports/getRetention';
 export * from './analytics/reports/getInsights';
 export * from './analytics/pageviews/getPageviewMetrics';
 export * from './analytics/pageviews/getPageviewStats';
@@ -19,8 +21,10 @@ export * from './analytics/sessions/createSession';
 export * from './analytics/sessions/getSession';
 export * from './analytics/sessions/getSessionMetrics';
 export * from './analytics/sessions/getSessions';
+export * from './analytics/sessions/getSessionStats';
 export * from './analytics/sessions/saveSessionData';
-export * from './analytics/stats/getActiveVisitors';
-export * from './analytics/stats/getRealtimeData';
-export * from './analytics/stats/getWebsiteDateRange';
-export * from './analytics/stats/getWebsiteStats';
+export * from './analytics/getActiveVisitors';
+export * from './analytics/getRealtimeData';
+export * from './analytics/getValues';
+export * from './analytics/getWebsiteDateRange';
+export * from './analytics/getWebsiteStats';
diff --git a/yarn.lock b/yarn.lock
index 275bcd631a..e18f833ca6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6371,10 +6371,10 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-next-basics@^0.35.0:
-  version "0.35.0"
-  resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.35.0.tgz#aa68fd35a0e3fbabfdaf570cd092b6a7cf8df6f5"
-  integrity sha512-yqXZMLe109hSJ8sebI/f2m1XNnVuQowpELOhZSGOFOmLfvUyFBAEi0ULdqX1eb8xbttLgjcrumrZfMgmEwuCPw==
+next-basics@^0.36.0:
+  version "0.36.0"
+  resolved "https://registry.yarnpkg.com/next-basics/-/next-basics-0.36.0.tgz#b1675c3f2b98df2fec8df605095dab7d17f9dc7b"
+  integrity sha512-Nwou8pCjFuoD/ZxUw9iKC7hhZeWbo/ng0ze74yck3W89MNc/CepwCDziflAHY5XcmIVNmpXOCu9OfmzTdVRPWQ==
   dependencies:
     bcryptjs "^2.4.3"
     jsonwebtoken "^9.0.0"
@@ -7557,10 +7557,10 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-basics@^0.91.0:
-  version "0.91.0"
-  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.91.0.tgz#2970529a22a455ec73a1be884eb93a109c9dafc0"
-  integrity sha512-vP8LYWiFwA+eguMEuHvHct4Jl5R/2GUjWc1tMujDG0CsAAUGhx68tAJr0K3gBrWjmpJrTPVfX8SdBNKSDAjQsw==
+react-basics@^0.98.0:
+  version "0.98.0"
+  resolved "https://registry.yarnpkg.com/react-basics/-/react-basics-0.98.0.tgz#b207bedbd9dac749d28ea6de2197a0efe648b78c"
+  integrity sha512-ebUigu+s6Iusq14EZTFTTUzdDPYFQEZjeD4feeq3o7dE+ndOVnajEdQ2va/x6CsRBUsWgjLJipfQi0XIrxYupA==
   dependencies:
     classnames "^2.3.1"
     date-fns "^2.29.3"