search works a little better