Rewrite week-over-week comparison

Support multi-field keys to identify rows