Corrected handling of searching for RB numbers