Wild card search fix