clearing unnecessary bloc fields
query builder improvements