search fix, too limiting matcher