fixed identified entity
removed sorting from useless columns
some performance improvements