Fixed search bug
Fixed index bug