minor cleanup. upgrade search plugin