more flexibility on match url and correction of update url