This reverts commit 543e089982e9b774c5cfbcc4d0eddb5f21373928.
Cleanup saved searches a bit Cleanup json parsing