Bugfixes around saved search edit and delete.
Merge branch 'my'