Final search fix. Honest.