Upgrading Angular + collection page fixes