diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 199b9a87d5..938bbc07e9 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -5891,6 +5891,8 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
 		"create index sr_call_id on sip_registrations (call_id)",
 		"create index sr_sip_user on sip_registrations (sip_user)",
 		"create index sr_sip_host on sip_registrations (sip_host)",
+		"create index sr_mwi_user on sip_registrations (mwi_user)",
+		"create index sr_mwi_host on sip_registrations (mwi_host)",
 		"create index sr_profile_name on sip_registrations (profile_name)",
 		"create index sr_presence_hosts on sip_registrations (presence_hosts)",
 		"create index sr_contact on sip_registrations (contact)",
@@ -5913,6 +5915,13 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
 		"create index ss_proto on sip_subscriptions (proto)",
 		"create index ss_sub_to_user on sip_subscriptions (sub_to_user)",
 		"create index ss_sub_to_host on sip_subscriptions (sub_to_host)",
+		"create index ss_expires on sip_subscriptions (expires)",
+		"create index ss_orig_proto on sip_subscriptions (orig_proto)",
+		"create index ss_network_port on sip_subscriptions (network_port)",
+		"create index ss_profile_name on sip_subscriptions (profile_name)",
+		"create index ss_version on sip_subscriptions (version)",
+		"create index ss_full_from on sip_subscriptions (full_from)",
+		"create index ss_contact on sip_subscriptions (contact)",
 		"create index sd_uuid on sip_dialogs (uuid)",
 		"create index sd_hostname on sip_dialogs (hostname)",
 		"create index sd_presence_data on sip_dialogs (presence_data)",
@@ -5920,9 +5929,23 @@ int sofia_glue_init_sql(sofia_profile_t *profile)
 		"create index sd_call_info_state on sip_dialogs (call_info_state)",
 		"create index sd_expires on sip_dialogs (expires)",
 		"create index sd_rcd on sip_dialogs (rcd)",
+		"create index sd_sip_to_tag on sip_dialogs (sip_to_tag)",
+		"create index sd_sip_from_user on sip_dialogs (sip_from_user)",
+		"create index sd_sip_from_host on sip_dialogs (sip_from_host)",
+		"create index sd_sip_to_host on sip_dialogs (sip_to_host)",
+		"create index sd_presence_id on sip_dialogs (presence_id)",
+		"create index sd_call_id on sip_dialogs (call_id)",
+		"create index sd_sip_from_tag on sip_dialogs (sip_from_tag)",
 		"create index sp_hostname on sip_presence (hostname)",
+		"create index sp_open_closed on sip_presence (open_closed)",
+		"create index sp_sip_user on sip_presence (sip_user)",
+		"create index sp_sip_host on sip_presence (sip_host)",
+		"create index sp_profile_name on sip_presence (profile_name)",
+		"create index sp_expires on sip_presence (expires)",
 		"create index sa_nonce on sip_authentication (nonce)",
 		"create index sa_hostname on sip_authentication (hostname)",
+		"create index sa_expires on sip_authentication (expires)",
+		"create index sa_last_nc on sip_authentication (last_nc)",
 		"create index ssa_hostname on sip_shared_appearance_subscriptions (hostname)",
 		"create index ssa_network_ip on sip_shared_appearance_subscriptions (network_ip)",
 		"create index ssa_subscriber on sip_shared_appearance_subscriptions (subscriber)",