Improvements for BPM search