-performance update in select entity
Merge pull request #100 from malmuki/Francois

-performance update in select entity