fix doublematch bug, add reestr