Entity indexing fix