Contine to refine matching; convert Proc to table functions to avoid nested Insert-Exec