Adding support for joins on other indexes