More rewrites for all tag stored procedures, no joins in table valued functions