br-search bug fixes