Regarding the duplicate/canonical URL issue. I'm really not sure what the right answer is. Maybe it's fine the way it is, maybe the canonical URL should be the expanded version (then the sitemap might change a lot causing other SEO issues). I just wanted to bring it up for discussion.
