update fix; return all match