search minor improvements