More work on the feed canonicalizer