Vanilla search fix