Added search and fixed formating.