Search works, no autcomplete
fixed merge conflict with search