Fix issue with different url types