Further improvements to fb filtering