Added search which looks ugly