Another change to track search better.