Enhance block form
Enhance clearQuery method for entity et queryBuilder classes