Since you're in here, would this be a good time to address the non-numeric search bug #71483?