Minor design change and fixed search.