CON-548: Added index to support hubs v3