Finally fixing all troubles with urls