various improvements around BQI