Do not create new URL but fetch it directly from bundle.
Minor cleanup to specify type of collections which allows the forech
cleanup to kick up too.