Fix manage block
Enhance entity and queryBuilder classes: to reuse entity object after one query