Added facts:canonical-grouping-key#1 and #2