fix BFQ for latest block changes improvements