Improve bgpicker logic