CDK-664: Fix constraint over-encoding in view URIs
CDK-664: Simplified URI building, additional tests