Fix of issue with different url types