finish up fixes with one for searching too

Can't stop breaking things