CF-375 fixing problems with urls