Bug fix for "empty" urls