More refinements to match
better matching / ranking
Convert match to table function, to avoid Exec Insert conflict