Fixing the urls the 'right way'