improved serve
fixed search bug