Fixing regression in saved search handling introduced in 103b1d1