#109 Make URLs consistent