tweak  links to pages and collection items on resource page, and commit migration from before to move resource usages to polymorphic