Search widget fix, take 2