added working search and byid