Updating to select only specified fields from generated CTE
Merge branch 'remove-rownumber'