Added search and fixnames