Fixes for cleaning up expired searches