Fixed client-side issue with generating URLs