Fixed some issues with integration of legacy relationship indexes