Changed and fixed search.