Improved, fixed search.