Resolve search bug