BS-8957, move tenantid as last index field