search improvement

... further improvement