diff --git a/api/chalicelib/blueprints/bp_core_dynamic.py b/api/chalicelib/blueprints/bp_core_dynamic.py
index 4beb73deb..b494ea953 100644
--- a/api/chalicelib/blueprints/bp_core_dynamic.py
+++ b/api/chalicelib/blueprints/bp_core_dynamic.py
@@ -1,18 +1,17 @@
 from chalice import Blueprint, Response
 
 from chalicelib import _overrides
+from chalicelib.core import assist
 from chalicelib.core import boarding
 from chalicelib.core import errors
 from chalicelib.core import license
-from chalicelib.core import metadata, errors_favorite_viewed, slack, alerts, sessions, integrations_manager, assist
+from chalicelib.core import metadata, errors_favorite_viewed, slack, alerts, sessions, integrations_manager
 from chalicelib.core import notifications
 from chalicelib.core import projects
 from chalicelib.core import signup
 from chalicelib.core import tenants
 from chalicelib.core import users
 from chalicelib.core import webhook
-from chalicelib.core import license
-from chalicelib.core import assist
 from chalicelib.core.collaboration_slack import Slack
 from chalicelib.utils import captcha
 from chalicelib.utils import helper
@@ -143,7 +142,10 @@ def put_client(context):
 
 @app.route('/signup', methods=['GET'], authorizer=None)
 def get_all_signup():
-    return {"data": tenants.tenants_exists()}
+    return {"data": {"tenants": tenants.tenants_exists(),
+                     "sso": None,
+                     "ssoProvider": None,
+                     "edition": helper.get_edition()}}
 
 
 @app.route('/signup', methods=['POST', 'PUT'], authorizer=None)
diff --git a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index bfd7177ce..0b7e8fa40 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -221,6 +221,7 @@ $$
                 role_id       integer                     REFERENCES roles (role_id) ON DELETE SET NULL,
                 internal_id   text                        NULL     DEFAULT NULL
             );
+            CREATE INDEX users_tenant_id_deleted_at_N_idx ON users (tenant_id) WHERE deleted_at ISNULL;
 
 
             CREATE TABLE basic_authentication
@@ -462,6 +463,7 @@ $$
             );
             CREATE INDEX ON issues (issue_id, type);
             CREATE INDEX issues_context_string_gin_idx ON public.issues USING GIN (context_string gin_trgm_ops);
+            CREATE INDEX issues_project_id_issue_id_idx ON public.issues (project_id, issue_id);
 
 -- --- errors.sql ---
 
@@ -590,6 +592,8 @@ $$
             CREATE INDEX ON sessions (project_id, user_country);
             CREATE INDEX ON sessions (project_id, user_browser);
             CREATE INDEX sessions_session_id_project_id_start_ts_durationNN_idx ON sessions (session_id, project_id, start_ts) WHERE duration IS NOT NULL;
+            CREATE INDEX sessions_user_id_useridNN_idx ON sessions (user_id) WHERE user_id IS NOT NULL;
+            CREATE INDEX sessions_uid_projectid_startts_sessionid_uidNN_durGTZ_idx ON sessions (user_id, project_id, start_ts, session_id) WHERE user_id IS NOT NULL AND duration > 0;
 
 
             ALTER TABLE public.sessions
@@ -664,6 +668,8 @@ $$
                 payload    jsonb DEFAULT NULL,
                 PRIMARY KEY (session_id, timestamp, seq_index)
             );
+            CREATE INDEX issues_issue_id_timestamp_idx ON events_common.issues (issue_id, timestamp);
+            CREATE INDEX issues_timestamp_idx ON events_common.issues (timestamp);
 
 
             CREATE TABLE events_common.requests
@@ -739,6 +745,7 @@ $$
             CREATE INDEX pages_load_time_idx ON events.pages (load_time) WHERE load_time > 0;
             CREATE INDEX pages_base_path_session_id_timestamp_idx ON events.pages (base_path, session_id, timestamp);
             CREATE INDEX pages_session_id_timestamp_idx ON events.pages (session_id, timestamp);
+            CREATE INDEX pages_base_path_base_pathLNGT2_idx ON events.pages (base_path) WHERE length(base_path) > 2;
 
             CREATE TABLE events.clicks
             (
diff --git a/frontend/app/components/Client/ManageUsers/ManageUsers.js b/frontend/app/components/Client/ManageUsers/ManageUsers.js
index e7936d35b..e70157cd0 100644
--- a/frontend/app/components/Client/ManageUsers/ManageUsers.js
+++ b/frontend/app/components/Client/ManageUsers/ManageUsers.js
@@ -116,7 +116,7 @@ class ManageUsers extends React.PureComponent {
           </div>
           { !account.smtp &&
             <div className={cn("mb-4 p-2", styles.smtpMessage)}>
-              SMTP is not configured. Please follow (see <a className="link" href="https://docs.openreplay.com/configuration/configure-smtp" target="_blank">here</a> how to set it up).  You can still add new users, but you’d have to manually copy then send them the invitation link.
+              SMTP is not configured (see <a className="link" href="https://docs.openreplay.com/configuration/configure-smtp" target="_blank">here</a> how to set it up).  You can still add new users, but you’d have to manually copy then send them the invitation link.
             </div>
           }
           <div className={ styles.formGroup }>
diff --git a/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js b/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js
index 8b26459f3..03171cdd0 100644
--- a/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js
+++ b/frontend/app/components/Session_/EventsBlock/Metadata/Metadata.js
@@ -27,7 +27,7 @@ export default connect(state => ({
         }
         content={
           <div className="p-2">
-            Metadata must be explicitly specified from the dashboard from <a href="/client/metadata" className="link">Preferences &#62; Metadata</a>.
+            Check <a href="https://docs.openreplay.com/installation/metadata" target="_blank" className="link">how to use Metadata</a> if you haven’t yet done so.
           </div>
         }
         on="click"
diff --git a/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index 8458199cb..80b2a9135 100644
--- a/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -460,6 +460,7 @@ $$
             CREATE INDEX errors_project_id_error_id_js_exception_idx ON public.errors (project_id, error_id) WHERE source = 'js_exception';
             CREATE INDEX errors_project_id_error_id_idx ON public.errors (project_id, error_id);
             CREATE INDEX errors_project_id_error_id_integration_idx ON public.errors (project_id, error_id) WHERE source != 'js_exception';
+            CREATE INDEX errors_error_id_idx ON errors (error_id);
 
             CREATE TABLE user_favorite_errors
             (
@@ -642,7 +643,9 @@ $$
                 payload    jsonb DEFAULT NULL,
                 PRIMARY KEY (session_id, timestamp, seq_index)
             );
-
+            CREATE INDEX issues_issue_id_timestamp_idx ON events_common.issues (issue_id, timestamp);
+            CREATE INDEX issues_timestamp_idx ON events_common.issues (timestamp);
+            CREATE INDEX issues_project_id_issue_id_idx ON public.issues (project_id, issue_id);
 
             CREATE TABLE events_common.requests
             (
@@ -751,6 +754,7 @@ $$
             CREATE INDEX clicks_url_idx ON events.clicks (url);
             CREATE INDEX clicks_url_gin_idx ON events.clicks USING GIN (url gin_trgm_ops);
             CREATE INDEX clicks_url_session_id_timestamp_selector_idx ON events.clicks (url, session_id, timestamp, selector);
+            CREATE INDEX clicks_session_id_timestamp_idx ON events.clicks (session_id, timestamp);
 
 
             CREATE TABLE events.inputs
@@ -782,6 +786,7 @@ $$
             CREATE INDEX errors_error_id_timestamp_idx ON events.errors (error_id, timestamp);
             CREATE INDEX errors_timestamp_error_id_session_id_idx ON events.errors (timestamp, error_id, session_id);
             CREATE INDEX errors_error_id_timestamp_session_id_idx ON events.errors (error_id, timestamp, session_id);
+            CREATE INDEX errors_error_id_idx ON events.errors (error_id);
 
             CREATE TABLE events.graphql
             (
diff --git a/scripts/helm/vars.yaml b/scripts/helm/vars.yaml
index fd7630965..5941894be 100644
--- a/scripts/helm/vars.yaml
+++ b/scripts/helm/vars.yaml
@@ -94,7 +94,7 @@ assets_bucket: sessions-assets
 recordings_bucket: mobs
 sourcemaps_bucket: sourcemaps
 kafka_endpoint: kafka.db.svc.cluster.local:9042
-kafka_ssl: false
+kafka_ssl: 'false'
 postgres_endpoint: postgresql.db.svc.cluster.local
 postgres_port: 5432
 postgres_db_name: postgres