Fix duplicate entities in index