Issue #5: Real fix - encoding URL parts