more optimization, only query the entities needed