Removed curb dependency.
Removed duplicate rank from URI