Switched to redux
Fixed search