URLs now generated correctly