Added search option (not quite working yet)