Revert "fix: simplify search bar filter string handling and reduce # of state changes (#4716)" This reverts commit 86785c72.