Search is more flexible now