Fixing BFP searches