Added search for single id and tests.