updated for beta 2, which search