Update empty indexes to use EMPTY_INDEX