Fix handling of uri-specific parameters